Merge "Update abi references for libstagefright_bufferqueue_helper" into qt-dev
diff --git a/Q/32/arm_armv7-a-neon/source-based/libstagefright_bufferpool@2.0.so.lsdump b/Q/32/arm_armv7-a-neon/source-based/libstagefright_bufferpool@2.0.so.lsdump
index f650c65..98205a7 100644
--- a/Q/32/arm_armv7-a-neon/source-based/libstagefright_bufferpool@2.0.so.lsdump
+++ b/Q/32/arm_armv7-a-neon/source-based/libstagefright_bufferpool@2.0.so.lsdump
@@ -197,10 +197,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2EjP13native_handlejb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEaSERKS7_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2EjP13native_handlejb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEaSERKS7_"
   },
   {
@@ -213,10 +229,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE17unmapGrantorDescrEPvj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE4readEPS5_j"
   },
   {
@@ -245,10 +257,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE17unmapGrantorDescrEPvj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE4readEPS5_j"
   },
   {
@@ -1733,6 +1741,54 @@
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-347"
+    },
+    {
+     "referenced_type" : "type-359"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2EjP13native_handlejb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-347"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-87"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
    "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::operator=",
    "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEaSERKS7_",
    "parameters" :
@@ -1749,6 +1805,54 @@
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
   },
   {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-368"
+    },
+    {
+     "referenced_type" : "type-359"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2EjP13native_handlejb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-368"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-87"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
    "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::operator=",
    "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEaSERKS7_",
    "parameters" :
@@ -1799,26 +1903,6 @@
    "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::unmapGrantorDescr",
-   "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE17unmapGrantorDescrEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-619"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-13"
-    }
-   ],
-   "return_type" : "type-70",
-   "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
-  },
-  {
    "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::read",
    "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE4readEPS5_j",
    "parameters" :
@@ -1944,26 +2028,6 @@
    "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::unmapGrantorDescr",
-   "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE17unmapGrantorDescrEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-620"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-13"
-    }
-   ],
-   "return_type" : "type-70",
-   "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
-  },
-  {
    "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::read",
    "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE4readEPS5_j",
    "parameters" :
@@ -8000,8 +8064,8 @@
     }
    ],
    "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-10",
    "self_type" : "type-10",
@@ -8060,8 +8124,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-254",
    "self_type" : "type-254",
@@ -8102,8 +8166,8 @@
     }
    ],
    "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-242",
    "self_type" : "type-242",
@@ -8144,8 +8208,8 @@
     }
    ],
    "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-338",
    "self_type" : "type-338",
diff --git a/Q/32/arm_armv7-a-neon/source-based/libui.so.lsdump b/Q/32/arm_armv7-a-neon/source-based/libui.so.lsdump
index dd4261a..20c7f22 100644
--- a/Q/32/arm_armv7-a-neon/source-based/libui.so.lsdump
+++ b/Q/32/arm_armv7-a-neon/source-based/libui.so.lsdump
@@ -24,7 +24,7 @@
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
    "referenced_type" : "type-200",
-   "self_type" : "type-2288",
+   "self_type" : "type-2277",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -1179,6 +1179,9 @@
    "name" : "_ZNK7android17Gralloc3Allocator8isLoadedEv"
   },
   {
+   "name" : "_ZNK7android22GraphicBufferAllocator12getTotalSizeEv"
+  },
+  {
    "name" : "_ZNK7android22GraphicBufferAllocator4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
   },
   {
@@ -2236,8 +2239,8 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "underlying_type" : "type-123",
@@ -4473,8 +4476,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2289",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "underlying_type" : "type-123",
@@ -4507,8 +4510,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2300",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2290",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "underlying_type" : "type-123",
@@ -7977,7 +7980,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2308"
+     "referenced_type" : "type-2298"
     }
    ],
    "return_type" : "type-151",
@@ -8134,7 +8137,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     },
     {
      "referenced_type" : "type-10"
@@ -8153,7 +8156,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     },
     {
      "referenced_type" : "type-10"
@@ -8178,7 +8181,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     },
     {
      "referenced_type" : "type-123"
@@ -8200,7 +8203,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     }
    ],
    "return_type" : "type-151",
@@ -8239,10 +8242,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     },
     {
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2288"
     }
    ],
    "return_type" : "type-151",
@@ -8255,7 +8258,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     },
     {
      "referenced_type" : "type-123"
@@ -8271,7 +8274,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     }
    ],
    "return_type" : "type-151",
@@ -8284,10 +8287,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     },
     {
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2288"
     }
    ],
    "return_type" : "type-151",
@@ -8300,7 +8303,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     },
     {
      "referenced_type" : "type-123"
@@ -8316,7 +8319,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     }
    ],
    "return_type" : "type-151",
@@ -8329,7 +8332,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     }
    ],
    "return_type" : "type-151",
@@ -8342,7 +8345,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     }
    ],
    "return_type" : "type-151",
@@ -8355,13 +8358,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     },
     {
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-2302",
+   "return_type" : "type-2292",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8604,13 +8607,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8620,13 +8623,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8636,10 +8639,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -8648,7 +8651,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8659,7 +8662,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-1246"
@@ -8668,7 +8671,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8679,10 +8682,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -8694,7 +8697,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8705,16 +8708,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8724,7 +8727,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-103"
@@ -8733,7 +8736,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8743,10 +8746,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8756,7 +8759,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-103"
@@ -8784,10 +8787,10 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2225"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-1246"
@@ -8806,10 +8809,10 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2225"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-1246"
@@ -8834,13 +8837,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2225"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
    "return_type" : "type-151",
@@ -8856,13 +8859,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2225"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -8880,10 +8883,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2229",
+   "return_type" : "type-2221",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8893,7 +8896,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-1246"
@@ -8909,7 +8912,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-103"
@@ -8928,7 +8931,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-123"
@@ -8947,7 +8950,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     }
    ],
    "return_type" : "type-151",
@@ -8960,13 +8963,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8976,13 +8979,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8992,10 +8995,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -9004,7 +9007,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9014,13 +9017,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9030,13 +9033,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9046,10 +9049,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -9058,7 +9061,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9068,13 +9071,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9084,13 +9087,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9100,10 +9103,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -9112,7 +9115,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9122,7 +9125,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-286"
@@ -9142,7 +9145,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-10"
@@ -9151,7 +9154,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9161,10 +9164,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2225"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -9183,7 +9186,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2225"
     },
     {
      "referenced_type" : "type-103"
@@ -9202,7 +9205,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-1119"
@@ -9221,7 +9224,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-1246"
@@ -9237,10 +9240,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
    "return_type" : "type-151",
@@ -9253,7 +9256,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     }
    ],
    "return_type" : "type-151",
@@ -9266,7 +9269,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-1246"
@@ -9282,10 +9285,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
    "return_type" : "type-151",
@@ -9298,7 +9301,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     }
    ],
    "return_type" : "type-151",
@@ -9311,7 +9314,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     }
    ],
    "return_type" : "type-151",
@@ -9324,7 +9327,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     }
    ],
    "return_type" : "type-151",
@@ -9337,13 +9340,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10291,6 +10294,19 @@
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
+   "function_name" : "android::GraphicBufferAllocator::getTotalSize",
+   "linker_set_key" : "_ZNK7android22GraphicBufferAllocator12getTotalSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-721"
+    }
+   ],
+   "return_type" : "type-123",
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
+  },
+  {
    "function_name" : "android::GraphicBufferAllocator::dump",
    "linker_set_key" : "_ZNK7android22GraphicBufferAllocator4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE",
    "parameters" :
@@ -10313,7 +10329,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-103"
@@ -10332,7 +10348,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-6",
@@ -10345,7 +10361,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-123",
@@ -10358,7 +10374,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-10",
@@ -10371,7 +10387,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-10",
@@ -10384,7 +10400,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-10",
@@ -10397,7 +10413,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-10",
@@ -10410,7 +10426,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-286"
@@ -10426,10 +10442,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-286"
@@ -10446,7 +10462,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-123",
@@ -10459,7 +10475,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-123",
@@ -10472,10 +10488,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
-   "return_type" : "type-2294",
+   "return_type" : "type-2283",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10485,10 +10501,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
-   "return_type" : "type-2287",
+   "return_type" : "type-2276",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10498,7 +10514,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-1246"
@@ -10518,13 +10534,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2229",
+   "return_type" : "type-2221",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10534,7 +10550,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-1050"
@@ -10550,7 +10566,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-1054"
@@ -10566,7 +10582,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-1280"
@@ -10582,7 +10598,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-103"
@@ -10601,7 +10617,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-123"
@@ -10617,13 +10633,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-2294",
+   "return_type" : "type-2283",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10815,13 +10831,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10831,13 +10847,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10847,10 +10863,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -10859,7 +10875,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10869,7 +10885,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     }
    ],
    "return_type" : "type-123",
@@ -10882,10 +10898,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
    "return_type" : "type-6",
@@ -10898,7 +10914,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     }
    ],
    "return_type" : "type-1299",
@@ -10911,7 +10927,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-286"
@@ -10931,10 +10947,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2241"
+     "referenced_type" : "type-2228"
     },
     {
      "referenced_type" : "type-286"
@@ -10954,7 +10970,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     }
    ],
    "return_type" : "type-1299",
@@ -10967,13 +10983,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10983,13 +10999,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10999,10 +11015,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -11011,7 +11027,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11021,7 +11037,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-227"
@@ -11040,7 +11056,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1284"
@@ -11056,7 +11072,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-103"
@@ -11075,7 +11091,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-122"
@@ -11091,13 +11107,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11107,13 +11123,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11123,10 +11139,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -11135,7 +11151,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11145,13 +11161,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11161,13 +11177,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11177,10 +11193,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -11189,7 +11205,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11200,7 +11216,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
@@ -11209,7 +11225,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11220,10 +11236,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -11235,7 +11251,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11246,16 +11262,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11265,7 +11281,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-103"
@@ -11274,7 +11290,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11549,7 +11565,7 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2235",
+   "referenced_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11674,8 +11690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2225",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11701,8 +11717,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11719,8 +11735,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2282",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11881,8 +11897,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2638",
-   "self_type" : "type-2637",
+   "referenced_type" : "type-2627",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11890,8 +11906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2852",
-   "self_type" : "type-2851",
+   "referenced_type" : "type-2841",
+   "self_type" : "type-2840",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11899,8 +11915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2928",
-   "self_type" : "type-2927",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2916",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12007,8 +12023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2302",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2292",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12032,35 +12048,35 @@
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
    "referenced_type" : "type-2204",
-   "self_type" : "type-2234",
+   "self_type" : "type-2230",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2251",
    "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-2751",
-   "self_type" : "type-2753",
+   "referenced_type" : "type-2740",
+   "self_type" : "type-2742",
    "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-3113",
-   "self_type" : "type-3145",
+   "referenced_type" : "type-3102",
+   "self_type" : "type-3134",
    "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-3386",
-   "self_type" : "type-3388",
+   "referenced_type" : "type-3368",
+   "self_type" : "type-3370",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -12073,29 +12089,29 @@
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2275",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2742",
-   "self_type" : "type-2744",
+   "referenced_type" : "type-2731",
+   "self_type" : "type-2733",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-3026",
-   "self_type" : "type-3036",
+   "referenced_type" : "type-3015",
+   "self_type" : "type-3025",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-3396",
-   "self_type" : "type-3398",
+   "referenced_type" : "type-3378",
+   "self_type" : "type-3380",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12190,8 +12206,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3039",
-   "self_type" : "type-3038",
+   "referenced_type" : "type-3028",
+   "self_type" : "type-3027",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12199,8 +12215,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3205",
-   "self_type" : "type-3204",
+   "referenced_type" : "type-3194",
+   "self_type" : "type-3193",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12208,8 +12224,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3209",
-   "self_type" : "type-3208",
+   "referenced_type" : "type-3198",
+   "self_type" : "type-3197",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12280,8 +12296,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2237",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2224",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12307,8 +12323,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12325,8 +12341,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2291",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2281",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12550,8 +12566,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2288",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12592,36 +12608,36 @@
   {
    "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-2267",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2258",
    "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-2270",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2264",
    "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-2754",
-   "self_type" : "type-2756",
+   "referenced_type" : "type-2743",
+   "self_type" : "type-2745",
    "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-3189",
-   "self_type" : "type-3201",
+   "referenced_type" : "type-3178",
+   "self_type" : "type-3190",
    "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-3389",
-   "self_type" : "type-3391",
+   "referenced_type" : "type-3371",
+   "self_type" : "type-3373",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -12715,92 +12731,92 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2332",
-   "self_type" : "type-2334",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2324",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2556",
-   "self_type" : "type-2558",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2547",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2591",
-   "self_type" : "type-2593",
+   "referenced_type" : "type-2580",
+   "self_type" : "type-2582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2766",
-   "self_type" : "type-2768",
+   "referenced_type" : "type-2755",
+   "self_type" : "type-2757",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2827",
-   "self_type" : "type-2829",
+   "referenced_type" : "type-2816",
+   "self_type" : "type-2818",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2846",
-   "self_type" : "type-2848",
+   "referenced_type" : "type-2835",
+   "self_type" : "type-2837",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2913",
-   "self_type" : "type-2915",
+   "referenced_type" : "type-2902",
+   "self_type" : "type-2904",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3059",
-   "self_type" : "type-3061",
+   "referenced_type" : "type-3048",
+   "self_type" : "type-3050",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3150",
-   "self_type" : "type-3153",
+   "referenced_type" : "type-3139",
+   "self_type" : "type-3142",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3227",
-   "self_type" : "type-3229",
+   "referenced_type" : "type-3216",
+   "self_type" : "type-3218",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3269",
-   "self_type" : "type-3271",
+   "referenced_type" : "type-3258",
+   "self_type" : "type-3260",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3320",
-   "self_type" : "type-3322",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3311",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3437",
-   "self_type" : "type-3439",
+   "referenced_type" : "type-3419",
+   "self_type" : "type-3421",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12919,8 +12935,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-2748",
-   "self_type" : "type-2750",
+   "referenced_type" : "type-2737",
+   "self_type" : "type-2739",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12928,8 +12944,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-3101",
-   "self_type" : "type-3109",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3098",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12955,8 +12971,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-2745",
-   "self_type" : "type-2747",
+   "referenced_type" : "type-2734",
+   "self_type" : "type-2736",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12964,8 +12980,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-3083",
-   "self_type" : "type-3093",
+   "referenced_type" : "type-3072",
+   "self_type" : "type-3082",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12982,8 +12998,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2287",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12991,8 +13007,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2757",
-   "self_type" : "type-2759",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2748",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13000,8 +13016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-3202",
-   "self_type" : "type-3207",
+   "referenced_type" : "type-3191",
+   "self_type" : "type-3196",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13018,8 +13034,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2523",
-   "self_type" : "type-2530",
+   "referenced_type" : "type-2513",
+   "self_type" : "type-2520",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13027,8 +13043,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2819",
-   "self_type" : "type-2821",
+   "referenced_type" : "type-2808",
+   "self_type" : "type-2810",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13036,8 +13052,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-3628",
-   "self_type" : "type-3635",
+   "referenced_type" : "type-3610",
+   "self_type" : "type-3617",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13054,8 +13070,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-3310",
-   "self_type" : "type-3312",
+   "referenced_type" : "type-3299",
+   "self_type" : "type-3301",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -13162,8 +13178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2415",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13171,8 +13187,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2561",
-   "self_type" : "type-2560",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2549",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13180,8 +13196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2692",
-   "self_type" : "type-2691",
+   "referenced_type" : "type-2681",
+   "self_type" : "type-2680",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13189,8 +13205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2805",
-   "self_type" : "type-2804",
+   "referenced_type" : "type-2794",
+   "self_type" : "type-2793",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13198,8 +13214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2831",
-   "self_type" : "type-2830",
+   "referenced_type" : "type-2820",
+   "self_type" : "type-2819",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13207,8 +13223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2882",
-   "self_type" : "type-2881",
+   "referenced_type" : "type-2871",
+   "self_type" : "type-2870",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13216,8 +13232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2973",
-   "self_type" : "type-2972",
+   "referenced_type" : "type-2962",
+   "self_type" : "type-2961",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13225,8 +13241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3054",
-   "self_type" : "type-3053",
+   "referenced_type" : "type-3043",
+   "self_type" : "type-3042",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13234,8 +13250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3129",
-   "self_type" : "type-3128",
+   "referenced_type" : "type-3118",
+   "self_type" : "type-3117",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13243,8 +13259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3212",
-   "self_type" : "type-3211",
+   "referenced_type" : "type-3201",
+   "self_type" : "type-3200",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13261,8 +13277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3307",
-   "self_type" : "type-3306",
+   "referenced_type" : "type-3296",
+   "self_type" : "type-3295",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13270,8 +13286,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3358",
-   "self_type" : "type-3357",
+   "referenced_type" : "type-3347",
+   "self_type" : "type-3346",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13279,8 +13295,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3531",
-   "self_type" : "type-3530",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3512",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13432,8 +13448,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-2273",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13441,8 +13457,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-2733",
-   "self_type" : "type-2732",
+   "referenced_type" : "type-2722",
+   "self_type" : "type-2721",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13450,8 +13466,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-2834",
-   "self_type" : "type-2833",
+   "referenced_type" : "type-2823",
+   "self_type" : "type-2822",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13459,8 +13475,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-3393",
-   "self_type" : "type-3392",
+   "referenced_type" : "type-3375",
+   "self_type" : "type-3374",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13486,8 +13502,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-2242",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2228",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13495,8 +13511,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-2304",
-   "self_type" : "type-2303",
+   "referenced_type" : "type-2294",
+   "self_type" : "type-2293",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13504,8 +13520,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-2309",
-   "self_type" : "type-2308",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2298",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13513,8 +13529,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-3127",
-   "self_type" : "type-3126",
+   "referenced_type" : "type-3116",
+   "self_type" : "type-3115",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13522,8 +13538,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-3381",
-   "self_type" : "type-3380",
+   "referenced_type" : "type-3360",
+   "self_type" : "type-3359",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13531,8 +13547,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3410",
-   "self_type" : "type-3409",
+   "referenced_type" : "type-3392",
+   "self_type" : "type-3391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13540,8 +13556,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3415",
-   "self_type" : "type-3414",
+   "referenced_type" : "type-3397",
+   "self_type" : "type-3396",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13597,8 +13613,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-3046",
-   "self_type" : "type-3045",
+   "referenced_type" : "type-3035",
+   "self_type" : "type-3034",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13642,8 +13658,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2492",
-   "self_type" : "type-2491",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2481",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13651,8 +13667,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2503",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13660,8 +13676,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2813",
-   "self_type" : "type-2812",
+   "referenced_type" : "type-2802",
+   "self_type" : "type-2801",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13669,8 +13685,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2818",
-   "self_type" : "type-2817",
+   "referenced_type" : "type-2807",
+   "self_type" : "type-2806",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13678,8 +13694,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3597",
-   "self_type" : "type-3596",
+   "referenced_type" : "type-3579",
+   "self_type" : "type-3578",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13687,8 +13703,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3619",
-   "self_type" : "type-3618",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3600",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13714,8 +13730,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2482",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2471",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13723,8 +13739,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2539",
-   "self_type" : "type-2538",
+   "referenced_type" : "type-2529",
+   "self_type" : "type-2528",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13732,8 +13748,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2808",
-   "self_type" : "type-2807",
+   "referenced_type" : "type-2797",
+   "self_type" : "type-2796",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13741,8 +13757,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2823",
-   "self_type" : "type-2822",
+   "referenced_type" : "type-2812",
+   "self_type" : "type-2811",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13750,8 +13766,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3587",
-   "self_type" : "type-3586",
+   "referenced_type" : "type-3569",
+   "self_type" : "type-3568",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13759,8 +13775,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3644",
-   "self_type" : "type-3643",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3625",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13784,24 +13800,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::CallStack *",
-   "name" : "android::CallStack *",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2222",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::CallStack::StackDeleter *",
-   "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2226",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-979",
@@ -13966,8 +13964,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2658",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2647",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13975,8 +13973,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2854",
-   "self_type" : "type-2853",
+   "referenced_type" : "type-2843",
+   "self_type" : "type-2842",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13993,8 +13991,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2932",
-   "self_type" : "type-2931",
+   "referenced_type" : "type-2921",
+   "self_type" : "type-2920",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -14021,7 +14019,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2232",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14227,8 +14225,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2318",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2307",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14236,8 +14234,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2484",
-   "self_type" : "type-2483",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14245,8 +14243,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2500",
+   "self_type" : "type-2499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14254,8 +14252,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2552",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14263,8 +14261,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2588",
-   "self_type" : "type-2587",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2576",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14272,8 +14270,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2763",
-   "self_type" : "type-2762",
+   "referenced_type" : "type-2752",
+   "self_type" : "type-2751",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14281,8 +14279,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2810",
-   "self_type" : "type-2809",
+   "referenced_type" : "type-2799",
+   "self_type" : "type-2798",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14290,8 +14288,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2815",
-   "self_type" : "type-2814",
+   "referenced_type" : "type-2804",
+   "self_type" : "type-2803",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14299,8 +14297,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2825",
-   "self_type" : "type-2824",
+   "referenced_type" : "type-2814",
+   "self_type" : "type-2813",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14308,8 +14306,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2844",
-   "self_type" : "type-2843",
+   "referenced_type" : "type-2833",
+   "self_type" : "type-2832",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14317,8 +14315,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2910",
-   "self_type" : "type-2909",
+   "referenced_type" : "type-2899",
+   "self_type" : "type-2898",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14326,8 +14324,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2995",
-   "self_type" : "type-2994",
+   "referenced_type" : "type-2984",
+   "self_type" : "type-2983",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14335,8 +14333,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3147",
-   "self_type" : "type-3146",
+   "referenced_type" : "type-3136",
+   "self_type" : "type-3135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14344,8 +14342,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3225",
-   "self_type" : "type-3224",
+   "referenced_type" : "type-3214",
+   "self_type" : "type-3213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14353,8 +14351,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3267",
-   "self_type" : "type-3266",
+   "referenced_type" : "type-3256",
+   "self_type" : "type-3255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14362,8 +14360,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3318",
-   "self_type" : "type-3317",
+   "referenced_type" : "type-3307",
+   "self_type" : "type-3306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14371,8 +14369,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3423",
-   "self_type" : "type-3422",
+   "referenced_type" : "type-3405",
+   "self_type" : "type-3404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14380,8 +14378,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3589",
-   "self_type" : "type-3588",
+   "referenced_type" : "type-3571",
+   "self_type" : "type-3570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14389,8 +14387,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3615",
-   "self_type" : "type-3614",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14470,8 +14468,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2223",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -14524,17 +14522,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2215",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14578,8 +14567,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2279",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14596,8 +14585,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2271",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14911,8 +14900,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2707",
-   "self_type" : "type-2706",
+   "referenced_type" : "type-2696",
+   "self_type" : "type-2695",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14920,8 +14909,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2889",
-   "self_type" : "type-2888",
+   "referenced_type" : "type-2878",
+   "self_type" : "type-2877",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14929,8 +14918,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3095",
-   "self_type" : "type-3094",
+   "referenced_type" : "type-3084",
+   "self_type" : "type-3083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14938,8 +14927,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3133",
-   "self_type" : "type-3132",
+   "referenced_type" : "type-3122",
+   "self_type" : "type-3121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14947,8 +14936,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3215",
-   "self_type" : "type-3214",
+   "referenced_type" : "type-3204",
+   "self_type" : "type-3203",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15019,8 +15008,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2977",
-   "self_type" : "type-2976",
+   "referenced_type" : "type-2966",
+   "self_type" : "type-2965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15028,8 +15017,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-3140",
-   "self_type" : "type-3139",
+   "referenced_type" : "type-3129",
+   "self_type" : "type-3128",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15037,8 +15026,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-3221",
-   "self_type" : "type-3220",
+   "referenced_type" : "type-3210",
+   "self_type" : "type-3209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15109,8 +15098,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2696",
-   "self_type" : "type-2695",
+   "referenced_type" : "type-2685",
+   "self_type" : "type-2684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15118,8 +15107,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2895",
-   "self_type" : "type-2894",
+   "referenced_type" : "type-2884",
+   "self_type" : "type-2883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15127,8 +15116,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3098",
-   "self_type" : "type-3097",
+   "referenced_type" : "type-3087",
+   "self_type" : "type-3086",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15136,8 +15125,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3135",
-   "self_type" : "type-3134",
+   "referenced_type" : "type-3124",
+   "self_type" : "type-3123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15145,8 +15134,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3217",
-   "self_type" : "type-3216",
+   "referenced_type" : "type-3206",
+   "self_type" : "type-3205",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15226,8 +15215,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2567",
-   "self_type" : "type-2566",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2555",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15235,8 +15224,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2839",
-   "self_type" : "type-2838",
+   "referenced_type" : "type-2828",
+   "self_type" : "type-2827",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15244,8 +15233,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3100",
-   "self_type" : "type-3099",
+   "referenced_type" : "type-3089",
+   "self_type" : "type-3088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15253,8 +15242,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3138",
-   "self_type" : "type-3137",
+   "referenced_type" : "type-3127",
+   "self_type" : "type-3126",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15262,8 +15251,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3219",
-   "self_type" : "type-3218",
+   "referenced_type" : "type-3208",
+   "self_type" : "type-3207",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15316,8 +15305,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-2704",
-   "self_type" : "type-2703",
+   "referenced_type" : "type-2693",
+   "self_type" : "type-2692",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15325,8 +15314,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-2886",
-   "self_type" : "type-2885",
+   "referenced_type" : "type-2875",
+   "self_type" : "type-2874",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15370,8 +15359,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2987",
-   "self_type" : "type-2986",
+   "referenced_type" : "type-2976",
+   "self_type" : "type-2975",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15379,8 +15368,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-3143",
-   "self_type" : "type-3142",
+   "referenced_type" : "type-3132",
+   "self_type" : "type-3131",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15388,8 +15377,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-3223",
-   "self_type" : "type-3222",
+   "referenced_type" : "type-3212",
+   "self_type" : "type-3211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15586,8 +15575,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2285",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15595,8 +15584,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2297",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15667,8 +15656,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-3049",
-   "self_type" : "type-3051",
+   "referenced_type" : "type-3038",
+   "self_type" : "type-3040",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15701,15 +15690,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::CallStack *",
-   "name" : "const android::CallStack *",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2224",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace *",
    "name" : "const android::ColorSpace *",
    "referenced_type" : "type-1039",
@@ -15838,8 +15818,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2230",
-   "self_type" : "type-2231",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15892,8 +15872,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15928,22 +15908,13 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2216",
+   "referenced_type" : "type-2215",
    "self_type" : "type-2219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::String8> *",
-   "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2213",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
    "referenced_type" : "type-1425",
@@ -16126,8 +16097,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-2724",
-   "self_type" : "type-2726",
+   "referenced_type" : "type-2713",
+   "self_type" : "type-2715",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16135,8 +16106,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-2890",
-   "self_type" : "type-2893",
+   "referenced_type" : "type-2879",
+   "self_type" : "type-2882",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16162,8 +16133,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-2983",
-   "self_type" : "type-2985",
+   "referenced_type" : "type-2972",
+   "self_type" : "type-2974",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16216,8 +16187,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-2564",
-   "self_type" : "type-2563",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2552",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16225,8 +16196,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-2836",
-   "self_type" : "type-2835",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16252,8 +16223,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-2574",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16261,8 +16232,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-2840",
-   "self_type" : "type-2842",
+   "referenced_type" : "type-2829",
+   "self_type" : "type-2831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16288,8 +16259,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-2898",
-   "self_type" : "type-2897",
+   "referenced_type" : "type-2887",
+   "self_type" : "type-2886",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16495,8 +16466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2301",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2291",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16504,8 +16475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2296",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17070,8 +17041,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17080,8 +17051,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2483",
-   "self_type" : "type-2485",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17090,8 +17061,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2509",
-   "self_type" : "type-2511",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17100,8 +17071,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2552",
-   "self_type" : "type-2554",
+   "referenced_type" : "type-2541",
+   "self_type" : "type-2543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17110,8 +17081,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2587",
-   "self_type" : "type-2589",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2578",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17120,8 +17091,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2762",
-   "self_type" : "type-2764",
+   "referenced_type" : "type-2751",
+   "self_type" : "type-2753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17130,8 +17101,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2809",
-   "self_type" : "type-2811",
+   "referenced_type" : "type-2798",
+   "self_type" : "type-2800",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17140,8 +17111,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2814",
-   "self_type" : "type-2816",
+   "referenced_type" : "type-2803",
+   "self_type" : "type-2805",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17150,8 +17121,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2824",
-   "self_type" : "type-2826",
+   "referenced_type" : "type-2813",
+   "self_type" : "type-2815",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17160,8 +17131,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2843",
-   "self_type" : "type-2845",
+   "referenced_type" : "type-2832",
+   "self_type" : "type-2834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17170,8 +17141,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2909",
-   "self_type" : "type-2911",
+   "referenced_type" : "type-2898",
+   "self_type" : "type-2900",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17180,8 +17151,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2994",
-   "self_type" : "type-2996",
+   "referenced_type" : "type-2983",
+   "self_type" : "type-2985",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17190,8 +17161,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3146",
-   "self_type" : "type-3148",
+   "referenced_type" : "type-3135",
+   "self_type" : "type-3137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17200,8 +17171,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3224",
-   "self_type" : "type-3226",
+   "referenced_type" : "type-3213",
+   "self_type" : "type-3215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17210,8 +17181,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3266",
-   "self_type" : "type-3268",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17220,8 +17191,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3317",
-   "self_type" : "type-3319",
+   "referenced_type" : "type-3306",
+   "self_type" : "type-3308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17230,8 +17201,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3422",
-   "self_type" : "type-3421",
+   "referenced_type" : "type-3404",
+   "self_type" : "type-3403",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17240,8 +17211,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3588",
-   "self_type" : "type-3590",
+   "referenced_type" : "type-3570",
+   "self_type" : "type-3572",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17250,8 +17221,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3614",
-   "self_type" : "type-3616",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3598",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17345,32 +17316,32 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2249",
    "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-2752",
-   "self_type" : "type-2751",
+   "referenced_type" : "type-2741",
+   "self_type" : "type-2740",
    "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-3114",
-   "self_type" : "type-3113",
+   "referenced_type" : "type-3103",
+   "self_type" : "type-3102",
    "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-3387",
-   "self_type" : "type-3386",
+   "referenced_type" : "type-3369",
+   "self_type" : "type-3368",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17385,8 +17356,8 @@
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-3050",
-   "self_type" : "type-3049",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3038",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -17419,32 +17390,32 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2273",
    "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-2743",
-   "self_type" : "type-2742",
+   "referenced_type" : "type-2732",
+   "self_type" : "type-2731",
    "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-3027",
-   "self_type" : "type-3026",
+   "referenced_type" : "type-3016",
+   "self_type" : "type-3015",
    "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-3397",
-   "self_type" : "type-3396",
+   "referenced_type" : "type-3379",
+   "self_type" : "type-3378",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -17466,16 +17437,6 @@
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CallStack",
-   "name" : "const android::CallStack",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2223",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::ColorSpace",
@@ -17630,8 +17591,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3040",
-   "self_type" : "type-3039",
+   "referenced_type" : "type-3029",
+   "self_type" : "type-3028",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17640,8 +17601,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3206",
-   "self_type" : "type-3205",
+   "referenced_type" : "type-3195",
+   "self_type" : "type-3194",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17650,8 +17611,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3210",
-   "self_type" : "type-3209",
+   "referenced_type" : "type-3199",
+   "self_type" : "type-3198",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17751,7 +17712,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2230",
+   "self_type" : "type-2231",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17810,8 +17771,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2220",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -17850,18 +17811,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2216",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::String8>",
-   "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2215",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17910,8 +17861,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2280",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -18150,8 +18101,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-2725",
-   "self_type" : "type-2724",
+   "referenced_type" : "type-2714",
+   "self_type" : "type-2713",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18160,8 +18111,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-2891",
-   "self_type" : "type-2890",
+   "referenced_type" : "type-2880",
+   "self_type" : "type-2879",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18190,8 +18141,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-2984",
-   "self_type" : "type-2983",
+   "referenced_type" : "type-2973",
+   "self_type" : "type-2972",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18390,8 +18341,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-2565",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2554",
+   "self_type" : "type-2553",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18400,8 +18351,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-2837",
-   "self_type" : "type-2836",
+   "referenced_type" : "type-2826",
+   "self_type" : "type-2825",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18430,8 +18381,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-2575",
-   "self_type" : "type-2574",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2563",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18440,8 +18391,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-2841",
-   "self_type" : "type-2840",
+   "referenced_type" : "type-2830",
+   "self_type" : "type-2829",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18470,8 +18421,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-2899",
-   "self_type" : "type-2898",
+   "referenced_type" : "type-2888",
+   "self_type" : "type-2887",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18750,8 +18701,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2286",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -18760,8 +18711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2305",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2295",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -18827,40 +18778,40 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2256",
    "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-2271",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
    "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-2755",
-   "self_type" : "type-2754",
+   "referenced_type" : "type-2744",
+   "self_type" : "type-2743",
    "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-3190",
-   "self_type" : "type-3189",
+   "referenced_type" : "type-3179",
+   "self_type" : "type-3178",
    "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-3390",
-   "self_type" : "type-3389",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -18977,104 +18928,104 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2322",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2557",
-   "self_type" : "type-2556",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2545",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2591",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2767",
-   "self_type" : "type-2766",
+   "referenced_type" : "type-2756",
+   "self_type" : "type-2755",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2828",
-   "self_type" : "type-2827",
+   "referenced_type" : "type-2817",
+   "self_type" : "type-2816",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2847",
-   "self_type" : "type-2846",
+   "referenced_type" : "type-2836",
+   "self_type" : "type-2835",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2914",
-   "self_type" : "type-2913",
+   "referenced_type" : "type-2903",
+   "self_type" : "type-2902",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3060",
-   "self_type" : "type-3059",
+   "referenced_type" : "type-3049",
+   "self_type" : "type-3048",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3151",
-   "self_type" : "type-3150",
+   "referenced_type" : "type-3140",
+   "self_type" : "type-3139",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3228",
-   "self_type" : "type-3227",
+   "referenced_type" : "type-3217",
+   "self_type" : "type-3216",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3270",
-   "self_type" : "type-3269",
+   "referenced_type" : "type-3259",
+   "self_type" : "type-3258",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3321",
-   "self_type" : "type-3320",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3309",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3438",
-   "self_type" : "type-3437",
+   "referenced_type" : "type-3420",
+   "self_type" : "type-3419",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19218,8 +19169,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-2749",
-   "self_type" : "type-2748",
+   "referenced_type" : "type-2738",
+   "self_type" : "type-2737",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19228,8 +19179,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-3102",
-   "self_type" : "type-3101",
+   "referenced_type" : "type-3091",
+   "self_type" : "type-3090",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19318,8 +19269,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2370",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2360",
    "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"
   },
@@ -19328,8 +19279,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2667",
-   "self_type" : "type-2666",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2655",
    "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"
   },
@@ -19338,8 +19289,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2773",
-   "self_type" : "type-2772",
+   "referenced_type" : "type-2762",
+   "self_type" : "type-2761",
    "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"
   },
@@ -19348,8 +19299,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2860",
-   "self_type" : "type-2859",
+   "referenced_type" : "type-2849",
+   "self_type" : "type-2848",
    "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"
   },
@@ -19358,8 +19309,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2936",
-   "self_type" : "type-2935",
+   "referenced_type" : "type-2925",
+   "self_type" : "type-2924",
    "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"
   },
@@ -19378,8 +19329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3067",
-   "self_type" : "type-3066",
+   "referenced_type" : "type-3056",
+   "self_type" : "type-3055",
    "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"
   },
@@ -19388,8 +19339,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3165",
-   "self_type" : "type-3164",
+   "referenced_type" : "type-3154",
+   "self_type" : "type-3153",
    "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"
   },
@@ -19398,8 +19349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3235",
-   "self_type" : "type-3234",
+   "referenced_type" : "type-3224",
+   "self_type" : "type-3223",
    "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"
   },
@@ -19408,8 +19359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3275",
-   "self_type" : "type-3274",
+   "referenced_type" : "type-3264",
+   "self_type" : "type-3263",
    "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"
   },
@@ -19418,8 +19369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3326",
-   "self_type" : "type-3325",
+   "referenced_type" : "type-3315",
+   "self_type" : "type-3314",
    "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"
   },
@@ -19428,8 +19379,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3475",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3457",
    "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"
   },
@@ -19588,8 +19539,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "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"
   },
@@ -19598,8 +19549,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2661",
    "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"
   },
@@ -19608,8 +19559,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2779",
-   "self_type" : "type-2778",
+   "referenced_type" : "type-2768",
+   "self_type" : "type-2767",
    "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"
   },
@@ -19618,8 +19569,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2866",
-   "self_type" : "type-2865",
+   "referenced_type" : "type-2855",
+   "self_type" : "type-2854",
    "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"
   },
@@ -19628,8 +19579,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2943",
-   "self_type" : "type-2942",
+   "referenced_type" : "type-2932",
+   "self_type" : "type-2931",
    "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"
   },
@@ -19638,8 +19589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3073",
-   "self_type" : "type-3072",
+   "referenced_type" : "type-3062",
+   "self_type" : "type-3061",
    "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"
   },
@@ -19658,8 +19609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3172",
-   "self_type" : "type-3171",
+   "referenced_type" : "type-3161",
+   "self_type" : "type-3160",
    "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"
   },
@@ -19668,8 +19619,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3241",
-   "self_type" : "type-3240",
+   "referenced_type" : "type-3230",
+   "self_type" : "type-3229",
    "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"
   },
@@ -19678,8 +19629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3281",
-   "self_type" : "type-3280",
+   "referenced_type" : "type-3270",
+   "self_type" : "type-3269",
    "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"
   },
@@ -19688,8 +19639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3332",
-   "self_type" : "type-3331",
+   "referenced_type" : "type-3321",
+   "self_type" : "type-3320",
    "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"
   },
@@ -19698,8 +19649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3482",
-   "self_type" : "type-3481",
+   "referenced_type" : "type-3464",
+   "self_type" : "type-3463",
    "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"
   },
@@ -19848,8 +19799,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "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"
   },
@@ -19858,8 +19809,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2675",
-   "self_type" : "type-2674",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2663",
    "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"
   },
@@ -19868,8 +19819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2781",
-   "self_type" : "type-2780",
+   "referenced_type" : "type-2770",
+   "self_type" : "type-2769",
    "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"
   },
@@ -19878,8 +19829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2868",
-   "self_type" : "type-2867",
+   "referenced_type" : "type-2857",
+   "self_type" : "type-2856",
    "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"
   },
@@ -19888,8 +19839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2945",
-   "self_type" : "type-2944",
+   "referenced_type" : "type-2934",
+   "self_type" : "type-2933",
    "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"
   },
@@ -19898,8 +19849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3075",
-   "self_type" : "type-3074",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3063",
    "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"
   },
@@ -19918,8 +19869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3174",
-   "self_type" : "type-3173",
+   "referenced_type" : "type-3163",
+   "self_type" : "type-3162",
    "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"
   },
@@ -19928,8 +19879,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3243",
-   "self_type" : "type-3242",
+   "referenced_type" : "type-3232",
+   "self_type" : "type-3231",
    "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"
   },
@@ -19938,8 +19889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3283",
-   "self_type" : "type-3282",
+   "referenced_type" : "type-3272",
+   "self_type" : "type-3271",
    "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"
   },
@@ -19948,8 +19899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3334",
-   "self_type" : "type-3333",
+   "referenced_type" : "type-3323",
+   "self_type" : "type-3322",
    "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"
   },
@@ -19958,8 +19909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3484",
-   "self_type" : "type-3483",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3465",
    "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"
   },
@@ -20098,8 +20049,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2375",
-   "self_type" : "type-2374",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "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"
   },
@@ -20108,8 +20059,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2671",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2659",
    "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"
   },
@@ -20118,8 +20069,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2777",
-   "self_type" : "type-2776",
+   "referenced_type" : "type-2766",
+   "self_type" : "type-2765",
    "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"
   },
@@ -20128,8 +20079,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2864",
-   "self_type" : "type-2863",
+   "referenced_type" : "type-2853",
+   "self_type" : "type-2852",
    "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"
   },
@@ -20138,8 +20089,18 @@
    "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-2941",
-   "self_type" : "type-2940",
+   "referenced_type" : "type-2930",
+   "self_type" : "type-2929",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
+   "referenced_type" : "type-3060",
+   "self_type" : "type-3059",
    "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"
   },
@@ -20158,8 +20119,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3071",
-   "self_type" : "type-3070",
+   "referenced_type" : "type-3158",
+   "self_type" : "type-3157",
    "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"
   },
@@ -20168,8 +20129,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3169",
-   "self_type" : "type-3168",
+   "referenced_type" : "type-3228",
+   "self_type" : "type-3227",
    "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"
   },
@@ -20178,8 +20139,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3239",
-   "self_type" : "type-3238",
+   "referenced_type" : "type-3268",
+   "self_type" : "type-3267",
    "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"
   },
@@ -20188,8 +20149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3279",
-   "self_type" : "type-3278",
+   "referenced_type" : "type-3319",
+   "self_type" : "type-3318",
    "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"
   },
@@ -20198,18 +20159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3330",
-   "self_type" : "type-3329",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3480",
-   "self_type" : "type-3479",
+   "referenced_type" : "type-3462",
+   "self_type" : "type-3461",
    "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"
   },
@@ -20368,8 +20319,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "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"
   },
@@ -20378,8 +20329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2676",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2665",
    "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"
   },
@@ -20388,8 +20339,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2783",
-   "self_type" : "type-2782",
+   "referenced_type" : "type-2772",
+   "self_type" : "type-2771",
    "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"
   },
@@ -20398,8 +20349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2870",
-   "self_type" : "type-2869",
+   "referenced_type" : "type-2859",
+   "self_type" : "type-2858",
    "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"
   },
@@ -20408,8 +20359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2947",
-   "self_type" : "type-2946",
+   "referenced_type" : "type-2936",
+   "self_type" : "type-2935",
    "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"
   },
@@ -20418,8 +20369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3078",
-   "self_type" : "type-3077",
+   "referenced_type" : "type-3067",
+   "self_type" : "type-3066",
    "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"
   },
@@ -20438,8 +20389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3176",
-   "self_type" : "type-3175",
+   "referenced_type" : "type-3165",
+   "self_type" : "type-3164",
    "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"
   },
@@ -20448,8 +20399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3245",
-   "self_type" : "type-3244",
+   "referenced_type" : "type-3234",
+   "self_type" : "type-3233",
    "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"
   },
@@ -20458,8 +20409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3285",
-   "self_type" : "type-3284",
+   "referenced_type" : "type-3274",
+   "self_type" : "type-3273",
    "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"
   },
@@ -20468,8 +20419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3336",
-   "self_type" : "type-3335",
+   "referenced_type" : "type-3325",
+   "self_type" : "type-3324",
    "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"
   },
@@ -20478,8 +20429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3486",
-   "self_type" : "type-3485",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3467",
    "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"
   },
@@ -20618,8 +20569,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2358",
    "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"
   },
@@ -20628,8 +20579,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2665",
-   "self_type" : "type-2664",
+   "referenced_type" : "type-2654",
+   "self_type" : "type-2653",
    "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"
   },
@@ -20638,8 +20589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2771",
-   "self_type" : "type-2770",
+   "referenced_type" : "type-2760",
+   "self_type" : "type-2759",
    "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"
   },
@@ -20648,8 +20599,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2858",
-   "self_type" : "type-2857",
+   "referenced_type" : "type-2847",
+   "self_type" : "type-2846",
    "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"
   },
@@ -20658,8 +20609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2934",
-   "self_type" : "type-2933",
+   "referenced_type" : "type-2923",
+   "self_type" : "type-2922",
    "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"
   },
@@ -20678,8 +20629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3065",
-   "self_type" : "type-3064",
+   "referenced_type" : "type-3054",
+   "self_type" : "type-3053",
    "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"
   },
@@ -20688,8 +20639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3163",
-   "self_type" : "type-3162",
+   "referenced_type" : "type-3152",
+   "self_type" : "type-3151",
    "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"
   },
@@ -20698,8 +20649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3233",
-   "self_type" : "type-3232",
+   "referenced_type" : "type-3222",
+   "self_type" : "type-3221",
    "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"
   },
@@ -20708,8 +20659,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3273",
-   "self_type" : "type-3272",
+   "referenced_type" : "type-3262",
+   "self_type" : "type-3261",
    "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"
   },
@@ -20718,8 +20669,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3324",
-   "self_type" : "type-3323",
+   "referenced_type" : "type-3313",
+   "self_type" : "type-3312",
    "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"
   },
@@ -20728,8 +20679,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3474",
-   "self_type" : "type-3473",
+   "referenced_type" : "type-3456",
+   "self_type" : "type-3455",
    "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"
   },
@@ -20878,8 +20829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2373",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
    "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"
   },
@@ -20888,8 +20839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2669",
-   "self_type" : "type-2668",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2657",
    "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"
   },
@@ -20898,8 +20849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2775",
-   "self_type" : "type-2774",
+   "referenced_type" : "type-2764",
+   "self_type" : "type-2763",
    "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"
   },
@@ -20908,8 +20859,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2862",
-   "self_type" : "type-2861",
+   "referenced_type" : "type-2851",
+   "self_type" : "type-2850",
    "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"
   },
@@ -20918,8 +20869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2938",
-   "self_type" : "type-2937",
+   "referenced_type" : "type-2927",
+   "self_type" : "type-2926",
    "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"
   },
@@ -20938,8 +20889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3069",
-   "self_type" : "type-3068",
+   "referenced_type" : "type-3058",
+   "self_type" : "type-3057",
    "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"
   },
@@ -20948,8 +20899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3167",
-   "self_type" : "type-3166",
+   "referenced_type" : "type-3156",
+   "self_type" : "type-3155",
    "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"
   },
@@ -20958,8 +20909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3237",
-   "self_type" : "type-3236",
+   "referenced_type" : "type-3226",
+   "self_type" : "type-3225",
    "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"
   },
@@ -20968,8 +20919,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3277",
-   "self_type" : "type-3276",
+   "referenced_type" : "type-3266",
+   "self_type" : "type-3265",
    "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"
   },
@@ -20978,8 +20929,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3328",
-   "self_type" : "type-3327",
+   "referenced_type" : "type-3317",
+   "self_type" : "type-3316",
    "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"
   },
@@ -20988,8 +20939,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3478",
-   "self_type" : "type-3477",
+   "referenced_type" : "type-3460",
+   "self_type" : "type-3459",
    "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"
   },
@@ -21148,8 +21099,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
    "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"
   },
@@ -21158,8 +21109,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2682",
-   "self_type" : "type-2681",
+   "referenced_type" : "type-2671",
+   "self_type" : "type-2670",
    "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"
   },
@@ -21168,8 +21119,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2787",
-   "self_type" : "type-2786",
+   "referenced_type" : "type-2776",
+   "self_type" : "type-2775",
    "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"
   },
@@ -21178,8 +21129,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2874",
-   "self_type" : "type-2873",
+   "referenced_type" : "type-2863",
+   "self_type" : "type-2862",
    "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"
   },
@@ -21188,8 +21139,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2952",
-   "self_type" : "type-2951",
+   "referenced_type" : "type-2941",
+   "self_type" : "type-2940",
    "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"
   },
@@ -21198,8 +21149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3082",
-   "self_type" : "type-3081",
+   "referenced_type" : "type-3071",
+   "self_type" : "type-3070",
    "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"
   },
@@ -21208,8 +21159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3181",
-   "self_type" : "type-3180",
+   "referenced_type" : "type-3170",
+   "self_type" : "type-3169",
    "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"
   },
@@ -21228,8 +21179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3249",
-   "self_type" : "type-3248",
+   "referenced_type" : "type-3238",
+   "self_type" : "type-3237",
    "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"
   },
@@ -21238,8 +21189,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3289",
-   "self_type" : "type-3288",
+   "referenced_type" : "type-3278",
+   "self_type" : "type-3277",
    "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"
   },
@@ -21248,8 +21199,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3340",
-   "self_type" : "type-3339",
+   "referenced_type" : "type-3329",
+   "self_type" : "type-3328",
    "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"
   },
@@ -21258,8 +21209,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3493",
+   "referenced_type" : "type-3476",
+   "self_type" : "type-3475",
    "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"
   },
@@ -21408,8 +21359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
    "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"
   },
@@ -21418,8 +21369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2685",
+   "referenced_type" : "type-2675",
+   "self_type" : "type-2674",
    "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"
   },
@@ -21428,8 +21379,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2791",
-   "self_type" : "type-2790",
+   "referenced_type" : "type-2780",
+   "self_type" : "type-2779",
    "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"
   },
@@ -21438,8 +21389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2878",
-   "self_type" : "type-2877",
+   "referenced_type" : "type-2867",
+   "self_type" : "type-2866",
    "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"
   },
@@ -21448,8 +21399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2956",
-   "self_type" : "type-2955",
+   "referenced_type" : "type-2945",
+   "self_type" : "type-2944",
    "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"
   },
@@ -21458,8 +21409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3088",
-   "self_type" : "type-3087",
+   "referenced_type" : "type-3077",
+   "self_type" : "type-3076",
    "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"
   },
@@ -21468,8 +21419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3186",
-   "self_type" : "type-3185",
+   "referenced_type" : "type-3175",
+   "self_type" : "type-3174",
    "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"
   },
@@ -21488,8 +21439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3253",
-   "self_type" : "type-3252",
+   "referenced_type" : "type-3242",
+   "self_type" : "type-3241",
    "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"
   },
@@ -21498,8 +21449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3293",
-   "self_type" : "type-3292",
+   "referenced_type" : "type-3282",
+   "self_type" : "type-3281",
    "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"
   },
@@ -21508,8 +21459,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3344",
-   "self_type" : "type-3343",
+   "referenced_type" : "type-3333",
+   "self_type" : "type-3332",
    "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"
   },
@@ -21518,8 +21469,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3498",
-   "self_type" : "type-3497",
+   "referenced_type" : "type-3480",
+   "self_type" : "type-3479",
    "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"
   },
@@ -21668,8 +21619,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "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"
   },
@@ -21678,8 +21629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2684",
-   "self_type" : "type-2683",
+   "referenced_type" : "type-2673",
+   "self_type" : "type-2672",
    "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"
   },
@@ -21688,8 +21639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2789",
-   "self_type" : "type-2788",
+   "referenced_type" : "type-2778",
+   "self_type" : "type-2777",
    "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"
   },
@@ -21698,8 +21649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2876",
-   "self_type" : "type-2875",
+   "referenced_type" : "type-2865",
+   "self_type" : "type-2864",
    "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"
   },
@@ -21708,8 +21659,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2954",
-   "self_type" : "type-2953",
+   "referenced_type" : "type-2943",
+   "self_type" : "type-2942",
    "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"
   },
@@ -21718,8 +21669,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3086",
-   "self_type" : "type-3085",
+   "referenced_type" : "type-3075",
+   "self_type" : "type-3074",
    "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"
   },
@@ -21728,8 +21679,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3183",
-   "self_type" : "type-3182",
+   "referenced_type" : "type-3172",
+   "self_type" : "type-3171",
    "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"
   },
@@ -21748,8 +21699,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3251",
-   "self_type" : "type-3250",
+   "referenced_type" : "type-3240",
+   "self_type" : "type-3239",
    "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"
   },
@@ -21758,8 +21709,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3291",
-   "self_type" : "type-3290",
+   "referenced_type" : "type-3280",
+   "self_type" : "type-3279",
    "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"
   },
@@ -21768,8 +21719,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3342",
-   "self_type" : "type-3341",
+   "referenced_type" : "type-3331",
+   "self_type" : "type-3330",
    "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"
   },
@@ -21778,8 +21729,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3496",
-   "self_type" : "type-3495",
+   "referenced_type" : "type-3478",
+   "self_type" : "type-3477",
    "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"
   },
@@ -21928,8 +21879,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2387",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2376",
    "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"
   },
@@ -21938,8 +21889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2679",
-   "self_type" : "type-2678",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
    "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"
   },
@@ -21948,8 +21899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2785",
-   "self_type" : "type-2784",
+   "referenced_type" : "type-2774",
+   "self_type" : "type-2773",
    "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"
   },
@@ -21958,8 +21909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2872",
-   "self_type" : "type-2871",
+   "referenced_type" : "type-2861",
+   "self_type" : "type-2860",
    "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"
   },
@@ -21968,8 +21919,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2950",
-   "self_type" : "type-2949",
+   "referenced_type" : "type-2939",
+   "self_type" : "type-2938",
    "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"
   },
@@ -21978,8 +21929,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3080",
-   "self_type" : "type-3079",
+   "referenced_type" : "type-3069",
+   "self_type" : "type-3068",
    "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"
   },
@@ -21998,8 +21949,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3179",
-   "self_type" : "type-3178",
+   "referenced_type" : "type-3168",
+   "self_type" : "type-3167",
    "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"
   },
@@ -22008,8 +21959,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3247",
-   "self_type" : "type-3246",
+   "referenced_type" : "type-3236",
+   "self_type" : "type-3235",
    "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"
   },
@@ -22018,8 +21969,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3287",
-   "self_type" : "type-3286",
+   "referenced_type" : "type-3276",
+   "self_type" : "type-3275",
    "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"
   },
@@ -22028,8 +21979,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3338",
-   "self_type" : "type-3337",
+   "referenced_type" : "type-3327",
+   "self_type" : "type-3326",
    "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"
   },
@@ -22038,8 +21989,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3492",
-   "self_type" : "type-3491",
+   "referenced_type" : "type-3474",
+   "self_type" : "type-3473",
    "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"
   },
@@ -22188,8 +22139,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2384",
    "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"
   },
@@ -22198,8 +22149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2687",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2676",
    "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"
   },
@@ -22208,8 +22159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2793",
-   "self_type" : "type-2792",
+   "referenced_type" : "type-2782",
+   "self_type" : "type-2781",
    "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"
   },
@@ -22218,8 +22169,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2880",
-   "self_type" : "type-2879",
+   "referenced_type" : "type-2869",
+   "self_type" : "type-2868",
    "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"
   },
@@ -22228,8 +22179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2959",
-   "self_type" : "type-2958",
+   "referenced_type" : "type-2948",
+   "self_type" : "type-2947",
    "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"
   },
@@ -22238,8 +22189,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3090",
-   "self_type" : "type-3089",
+   "referenced_type" : "type-3079",
+   "self_type" : "type-3078",
    "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"
   },
@@ -22248,8 +22199,18 @@
    "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-3188",
-   "self_type" : "type-3187",
+   "referenced_type" : "type-3177",
+   "self_type" : "type-3176",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3244",
+   "self_type" : "type-3243",
    "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"
   },
@@ -22268,8 +22229,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3255",
-   "self_type" : "type-3254",
+   "referenced_type" : "type-3284",
+   "self_type" : "type-3283",
    "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"
   },
@@ -22278,8 +22239,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3295",
-   "self_type" : "type-3294",
+   "referenced_type" : "type-3335",
+   "self_type" : "type-3334",
    "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"
   },
@@ -22288,18 +22249,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3346",
-   "self_type" : "type-3345",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3500",
-   "self_type" : "type-3499",
+   "referenced_type" : "type-3482",
+   "self_type" : "type-3481",
    "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"
   },
@@ -22428,8 +22379,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-2407",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2396",
    "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"
   },
@@ -22438,8 +22389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2801",
-   "self_type" : "type-2800",
+   "referenced_type" : "type-2790",
+   "self_type" : "type-2789",
    "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"
   },
@@ -22448,8 +22399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2968",
-   "self_type" : "type-2967",
+   "referenced_type" : "type-2957",
+   "self_type" : "type-2956",
    "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"
   },
@@ -22458,8 +22409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3198",
-   "self_type" : "type-3197",
+   "referenced_type" : "type-3187",
+   "self_type" : "type-3186",
    "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"
   },
@@ -22468,8 +22419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3263",
-   "self_type" : "type-3262",
+   "referenced_type" : "type-3252",
+   "self_type" : "type-3251",
    "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"
   },
@@ -22478,8 +22429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3303",
-   "self_type" : "type-3302",
+   "referenced_type" : "type-3292",
+   "self_type" : "type-3291",
    "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"
   },
@@ -22488,8 +22439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3354",
-   "self_type" : "type-3353",
+   "referenced_type" : "type-3343",
+   "self_type" : "type-3342",
    "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"
   },
@@ -22498,8 +22449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3512",
-   "self_type" : "type-3511",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3493",
    "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"
   },
@@ -22618,8 +22569,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-2405",
-   "self_type" : "type-2404",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2394",
    "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"
   },
@@ -22628,8 +22579,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2799",
-   "self_type" : "type-2798",
+   "referenced_type" : "type-2788",
+   "self_type" : "type-2787",
    "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"
   },
@@ -22638,8 +22589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2966",
-   "self_type" : "type-2965",
+   "referenced_type" : "type-2955",
+   "self_type" : "type-2954",
    "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"
   },
@@ -22648,8 +22599,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3196",
-   "self_type" : "type-3195",
+   "referenced_type" : "type-3185",
+   "self_type" : "type-3184",
    "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"
   },
@@ -22658,8 +22609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3261",
-   "self_type" : "type-3260",
+   "referenced_type" : "type-3250",
+   "self_type" : "type-3249",
    "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"
   },
@@ -22668,8 +22619,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3301",
-   "self_type" : "type-3300",
+   "referenced_type" : "type-3290",
+   "self_type" : "type-3289",
    "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"
   },
@@ -22678,8 +22629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3352",
-   "self_type" : "type-3351",
+   "referenced_type" : "type-3341",
+   "self_type" : "type-3340",
    "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"
   },
@@ -22688,8 +22639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3510",
-   "self_type" : "type-3509",
+   "referenced_type" : "type-3492",
+   "self_type" : "type-3491",
    "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"
   },
@@ -22808,8 +22759,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-2403",
-   "self_type" : "type-2402",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2392",
    "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"
   },
@@ -22818,8 +22769,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2797",
-   "self_type" : "type-2796",
+   "referenced_type" : "type-2786",
+   "self_type" : "type-2785",
    "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"
   },
@@ -22828,8 +22779,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2963",
-   "self_type" : "type-2962",
+   "referenced_type" : "type-2952",
+   "self_type" : "type-2951",
    "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"
   },
@@ -22838,8 +22789,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3194",
-   "self_type" : "type-3193",
+   "referenced_type" : "type-3183",
+   "self_type" : "type-3182",
    "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"
   },
@@ -22848,8 +22799,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3259",
-   "self_type" : "type-3258",
+   "referenced_type" : "type-3248",
+   "self_type" : "type-3247",
    "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"
   },
@@ -22858,8 +22809,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3299",
-   "self_type" : "type-3298",
+   "referenced_type" : "type-3288",
+   "self_type" : "type-3287",
    "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"
   },
@@ -22868,8 +22819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3350",
-   "self_type" : "type-3349",
+   "referenced_type" : "type-3339",
+   "self_type" : "type-3338",
    "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"
   },
@@ -22878,8 +22829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3508",
-   "self_type" : "type-3507",
+   "referenced_type" : "type-3490",
+   "self_type" : "type-3489",
    "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"
   },
@@ -22998,8 +22949,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-2401",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
    "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"
   },
@@ -23008,8 +22959,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2795",
-   "self_type" : "type-2794",
+   "referenced_type" : "type-2784",
+   "self_type" : "type-2783",
    "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"
   },
@@ -23018,8 +22969,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2961",
-   "self_type" : "type-2960",
+   "referenced_type" : "type-2950",
+   "self_type" : "type-2949",
    "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"
   },
@@ -23028,8 +22979,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3192",
-   "self_type" : "type-3191",
+   "referenced_type" : "type-3181",
+   "self_type" : "type-3180",
    "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"
   },
@@ -23038,8 +22989,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3257",
-   "self_type" : "type-3256",
+   "referenced_type" : "type-3246",
+   "self_type" : "type-3245",
    "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"
   },
@@ -23048,8 +22999,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3297",
-   "self_type" : "type-3296",
+   "referenced_type" : "type-3286",
+   "self_type" : "type-3285",
    "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"
   },
@@ -23058,8 +23009,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3348",
-   "self_type" : "type-3347",
+   "referenced_type" : "type-3337",
+   "self_type" : "type-3336",
    "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"
   },
@@ -23068,8 +23019,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3506",
-   "self_type" : "type-3505",
+   "referenced_type" : "type-3488",
+   "self_type" : "type-3487",
    "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"
   },
@@ -23188,8 +23139,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-2409",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2398",
    "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"
   },
@@ -23198,8 +23149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2803",
-   "self_type" : "type-2802",
+   "referenced_type" : "type-2792",
+   "self_type" : "type-2791",
    "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"
   },
@@ -23208,8 +23159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2970",
-   "self_type" : "type-2969",
+   "referenced_type" : "type-2959",
+   "self_type" : "type-2958",
    "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"
   },
@@ -23218,8 +23169,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3200",
-   "self_type" : "type-3199",
+   "referenced_type" : "type-3189",
+   "self_type" : "type-3188",
    "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"
   },
@@ -23228,8 +23179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3265",
-   "self_type" : "type-3264",
+   "referenced_type" : "type-3254",
+   "self_type" : "type-3253",
    "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"
   },
@@ -23238,8 +23189,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3305",
-   "self_type" : "type-3304",
+   "referenced_type" : "type-3294",
+   "self_type" : "type-3293",
    "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"
   },
@@ -23248,8 +23199,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3356",
-   "self_type" : "type-3355",
+   "referenced_type" : "type-3345",
+   "self_type" : "type-3344",
    "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"
   },
@@ -23258,8 +23209,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3513",
+   "referenced_type" : "type-3496",
+   "self_type" : "type-3495",
    "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"
   },
@@ -23368,8 +23319,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2613",
-   "self_type" : "type-2612",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2601",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23378,8 +23329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2850",
-   "self_type" : "type-2849",
+   "referenced_type" : "type-2839",
+   "self_type" : "type-2838",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23388,8 +23339,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2923",
-   "self_type" : "type-2922",
+   "referenced_type" : "type-2912",
+   "self_type" : "type-2911",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23398,8 +23349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3063",
-   "self_type" : "type-3062",
+   "referenced_type" : "type-3052",
+   "self_type" : "type-3051",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23408,8 +23359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3159",
-   "self_type" : "type-3158",
+   "referenced_type" : "type-3148",
+   "self_type" : "type-3147",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23418,8 +23369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3231",
-   "self_type" : "type-3230",
+   "referenced_type" : "type-3220",
+   "self_type" : "type-3219",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23488,8 +23439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2746",
-   "self_type" : "type-2745",
+   "referenced_type" : "type-2735",
+   "self_type" : "type-2734",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23498,8 +23449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-3084",
-   "self_type" : "type-3083",
+   "referenced_type" : "type-3073",
+   "self_type" : "type-3072",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23518,8 +23469,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2245",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23528,8 +23479,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2738",
-   "self_type" : "type-2737",
+   "referenced_type" : "type-2727",
+   "self_type" : "type-2726",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23538,8 +23489,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2856",
-   "self_type" : "type-2855",
+   "referenced_type" : "type-2845",
+   "self_type" : "type-2844",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23548,8 +23499,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-3383",
-   "self_type" : "type-3382",
+   "referenced_type" : "type-3365",
+   "self_type" : "type-3364",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23578,8 +23529,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2247",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23588,8 +23539,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2741",
-   "self_type" : "type-2740",
+   "referenced_type" : "type-2730",
+   "self_type" : "type-2729",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23598,8 +23549,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2926",
-   "self_type" : "type-2925",
+   "referenced_type" : "type-2915",
+   "self_type" : "type-2914",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23608,8 +23559,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-3385",
-   "self_type" : "type-3384",
+   "referenced_type" : "type-3367",
+   "self_type" : "type-3366",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23638,8 +23589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2266",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23648,8 +23599,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2758",
-   "self_type" : "type-2757",
+   "referenced_type" : "type-2747",
+   "self_type" : "type-2746",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23658,8 +23609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-3203",
-   "self_type" : "type-3202",
+   "referenced_type" : "type-3192",
+   "self_type" : "type-3191",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23678,8 +23629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2524",
-   "self_type" : "type-2523",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23688,8 +23639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2820",
-   "self_type" : "type-2819",
+   "referenced_type" : "type-2809",
+   "self_type" : "type-2808",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23698,8 +23649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-3629",
-   "self_type" : "type-3628",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3610",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23718,8 +23669,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-3311",
-   "self_type" : "type-3310",
+   "referenced_type" : "type-3300",
+   "self_type" : "type-3299",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -23838,8 +23789,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2416",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23848,8 +23799,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2562",
-   "self_type" : "type-2561",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2550",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23858,8 +23809,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2693",
-   "self_type" : "type-2692",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2681",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23868,8 +23819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2806",
-   "self_type" : "type-2805",
+   "referenced_type" : "type-2795",
+   "self_type" : "type-2794",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23878,8 +23829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2832",
-   "self_type" : "type-2831",
+   "referenced_type" : "type-2821",
+   "self_type" : "type-2820",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23888,8 +23839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2883",
-   "self_type" : "type-2882",
+   "referenced_type" : "type-2872",
+   "self_type" : "type-2871",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23898,8 +23849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2974",
-   "self_type" : "type-2973",
+   "referenced_type" : "type-2963",
+   "self_type" : "type-2962",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23908,8 +23859,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3055",
-   "self_type" : "type-3054",
+   "referenced_type" : "type-3044",
+   "self_type" : "type-3043",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23918,8 +23869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3130",
-   "self_type" : "type-3129",
+   "referenced_type" : "type-3119",
+   "self_type" : "type-3118",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23928,8 +23879,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3213",
-   "self_type" : "type-3212",
+   "referenced_type" : "type-3202",
+   "self_type" : "type-3201",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3297",
+   "self_type" : "type-3296",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23948,8 +23909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3308",
-   "self_type" : "type-3307",
+   "referenced_type" : "type-3348",
+   "self_type" : "type-3347",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23958,18 +23919,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3359",
-   "self_type" : "type-3358",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3532",
-   "self_type" : "type-3531",
+   "referenced_type" : "type-3514",
+   "self_type" : "type-3513",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -24403,35 +24354,6 @@
    ]
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFrameLines",
-     "referenced_type" : "type-2210"
-    }
-   ],
-   "linker_set_key" : "android::CallStack",
-   "name" : "android::CallStack",
-   "record_kind" : "class",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStackE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CallStack::StackDeleter",
-   "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2225",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
@@ -25370,11 +25292,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2228",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2222",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2229" ],
+   "template_args" : [ "type-2221" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -25751,7 +25673,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2228"
+     "referenced_type" : "type-2222"
     }
    ],
    "fields" :
@@ -25759,14 +25681,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2214"
+     "referenced_type" : "type-2213"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2229",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2221",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -26197,8 +26119,8 @@
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2213",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -26359,61 +26281,6 @@
      "referenced_type" : "type-235"
     }
    ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2210",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-285" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-235"
-    }
-   ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
@@ -26778,28 +26645,28 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-2255"
+    },
+    {
+     "referenced_type" : "type-2252"
+    },
+    {
      "referenced_type" : "type-2265"
     },
     {
-     "referenced_type" : "type-2266"
+     "referenced_type" : "type-2268"
     },
     {
-     "referenced_type" : "type-2264"
+     "referenced_type" : "type-2270"
     },
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2269"
     },
     {
-     "referenced_type" : "type-2278"
-    },
-    {
-     "referenced_type" : "type-2280"
-    },
-    {
-     "referenced_type" : "type-2279"
-    },
-    {
-     "referenced_type" : "type-2282"
+     "referenced_type" : "type-2272"
     }
    ],
    "fields" :
@@ -26807,14 +26674,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2277"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2287",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -26837,8 +26704,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-2282",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26861,8 +26728,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-2279",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26885,8 +26752,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-2277",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2265",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26909,8 +26776,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-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2268",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26933,8 +26800,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-2280",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28319,8 +28186,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-2264",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2252",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28451,8 +28318,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-2266",
-   "self_type" : "type-2266",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28835,8 +28702,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-2265",
-   "self_type" : "type-2265",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -31669,8 +31536,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2234",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -32582,8 +32449,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -32651,7 +32518,7 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2295"
+     "referenced_type" : "type-2284"
     },
     {
      "access" : "private",
@@ -32663,8 +32530,8 @@
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -32681,8 +32548,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -32692,13 +32559,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2246"
+     "referenced_type" : "type-2209"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
diff --git a/Q/32/x86/source-based/libstagefright_bufferpool@2.0.so.lsdump b/Q/32/x86/source-based/libstagefright_bufferpool@2.0.so.lsdump
index b23246a..a7d8cc3 100644
--- a/Q/32/x86/source-based/libstagefright_bufferpool@2.0.so.lsdump
+++ b/Q/32/x86/source-based/libstagefright_bufferpool@2.0.so.lsdump
@@ -188,10 +188,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2EjP13native_handlejb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEaSERKS7_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2EjP13native_handlejb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEaSERKS7_"
   },
   {
@@ -204,10 +220,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE17unmapGrantorDescrEPvj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE4readEPS5_j"
   },
   {
@@ -236,10 +248,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE17unmapGrantorDescrEPvj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE4readEPS5_j"
   },
   {
@@ -1676,6 +1684,54 @@
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-268"
+    },
+    {
+     "referenced_type" : "type-272"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2EjP13native_handlejb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-268"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-87"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
    "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::operator=",
    "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEaSERKS7_",
    "parameters" :
@@ -1692,6 +1748,54 @@
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
   },
   {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-277"
+    },
+    {
+     "referenced_type" : "type-272"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2EjP13native_handlejb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-277"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-87"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
    "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::operator=",
    "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEaSERKS7_",
    "parameters" :
@@ -1742,26 +1846,6 @@
    "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::unmapGrantorDescr",
-   "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE17unmapGrantorDescrEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-444"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-13"
-    }
-   ],
-   "return_type" : "type-70",
-   "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
-  },
-  {
    "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::read",
    "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE4readEPS5_j",
    "parameters" :
@@ -1887,26 +1971,6 @@
    "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::unmapGrantorDescr",
-   "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE17unmapGrantorDescrEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-445"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-13"
-    }
-   ],
-   "return_type" : "type-70",
-   "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
-  },
-  {
    "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::read",
    "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE4readEPS5_j",
    "parameters" :
@@ -7026,8 +7090,8 @@
     }
    ],
    "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-10",
    "self_type" : "type-10",
@@ -7086,8 +7150,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-228",
    "self_type" : "type-228",
@@ -7128,8 +7192,8 @@
     }
    ],
    "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-223",
    "self_type" : "type-223",
@@ -7170,8 +7234,8 @@
     }
    ],
    "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-264",
    "self_type" : "type-264",
diff --git a/Q/32/x86/source-based/libui.so.lsdump b/Q/32/x86/source-based/libui.so.lsdump
index 17ccc10..ba6360c 100644
--- a/Q/32/x86/source-based/libui.so.lsdump
+++ b/Q/32/x86/source-based/libui.so.lsdump
@@ -24,7 +24,7 @@
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
    "referenced_type" : "type-200",
-   "self_type" : "type-2438",
+   "self_type" : "type-2428",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -1178,6 +1178,9 @@
    "name" : "_ZNK7android17Gralloc3Allocator8isLoadedEv"
   },
   {
+   "name" : "_ZNK7android22GraphicBufferAllocator12getTotalSizeEv"
+  },
+  {
    "name" : "_ZNK7android22GraphicBufferAllocator4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
   },
   {
@@ -2193,8 +2196,8 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "underlying_type" : "type-123",
@@ -4430,8 +4433,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2449",
-   "self_type" : "type-2449",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "underlying_type" : "type-123",
@@ -4464,8 +4467,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2450",
-   "self_type" : "type-2450",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "underlying_type" : "type-123",
@@ -7934,7 +7937,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2458"
+     "referenced_type" : "type-2448"
     }
    ],
    "return_type" : "type-151",
@@ -8091,7 +8094,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
      "referenced_type" : "type-10"
@@ -8110,7 +8113,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
      "referenced_type" : "type-10"
@@ -8135,7 +8138,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
      "referenced_type" : "type-123"
@@ -8157,7 +8160,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     }
    ],
    "return_type" : "type-151",
@@ -8196,10 +8199,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2438"
     }
    ],
    "return_type" : "type-151",
@@ -8212,7 +8215,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
      "referenced_type" : "type-123"
@@ -8228,7 +8231,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     }
    ],
    "return_type" : "type-151",
@@ -8241,10 +8244,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2438"
     }
    ],
    "return_type" : "type-151",
@@ -8257,7 +8260,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
      "referenced_type" : "type-123"
@@ -8273,7 +8276,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     }
    ],
    "return_type" : "type-151",
@@ -8286,7 +8289,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     }
    ],
    "return_type" : "type-151",
@@ -8299,7 +8302,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     }
    ],
    "return_type" : "type-151",
@@ -8312,13 +8315,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-2452",
+   "return_type" : "type-2442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8561,13 +8564,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8577,13 +8580,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8593,10 +8596,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -8605,7 +8608,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8616,7 +8619,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
@@ -8625,7 +8628,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8636,10 +8639,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -8651,7 +8654,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8662,16 +8665,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8681,7 +8684,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-103"
@@ -8690,7 +8693,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8700,10 +8703,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8713,7 +8716,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-103"
@@ -8741,10 +8744,10 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
@@ -8763,10 +8766,10 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
@@ -8791,13 +8794,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-151",
@@ -8813,13 +8816,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -8837,10 +8840,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2397",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8850,7 +8853,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
@@ -8866,7 +8869,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-103"
@@ -8885,7 +8888,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-123"
@@ -8904,7 +8907,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     }
    ],
    "return_type" : "type-151",
@@ -8917,13 +8920,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8933,13 +8936,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8949,10 +8952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -8961,7 +8964,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8971,13 +8974,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8987,13 +8990,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9003,10 +9006,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -9015,7 +9018,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9025,13 +9028,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9041,13 +9044,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9057,10 +9060,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -9069,7 +9072,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9079,7 +9082,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-286"
@@ -9099,7 +9102,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-10"
@@ -9108,7 +9111,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9118,10 +9121,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -9140,7 +9143,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -9159,7 +9162,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1119"
@@ -9178,7 +9181,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
@@ -9194,10 +9197,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-151",
@@ -9210,7 +9213,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     }
    ],
    "return_type" : "type-151",
@@ -9223,7 +9226,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
@@ -9239,10 +9242,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-151",
@@ -9255,7 +9258,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     }
    ],
    "return_type" : "type-151",
@@ -9268,7 +9271,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     }
    ],
    "return_type" : "type-151",
@@ -9281,7 +9284,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     }
    ],
    "return_type" : "type-151",
@@ -9294,13 +9297,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10248,6 +10251,19 @@
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
+   "function_name" : "android::GraphicBufferAllocator::getTotalSize",
+   "linker_set_key" : "_ZNK7android22GraphicBufferAllocator12getTotalSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-721"
+    }
+   ],
+   "return_type" : "type-123",
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
+  },
+  {
    "function_name" : "android::GraphicBufferAllocator::dump",
    "linker_set_key" : "_ZNK7android22GraphicBufferAllocator4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE",
    "parameters" :
@@ -10270,7 +10286,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-103"
@@ -10289,7 +10305,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-6",
@@ -10302,7 +10318,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-123",
@@ -10315,7 +10331,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-10",
@@ -10328,7 +10344,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-10",
@@ -10341,7 +10357,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-10",
@@ -10354,7 +10370,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-10",
@@ -10367,7 +10383,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-286"
@@ -10383,10 +10399,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
-     "referenced_type" : "type-2453"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-286"
@@ -10403,7 +10419,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-123",
@@ -10416,7 +10432,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-123",
@@ -10429,10 +10445,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-2444",
+   "return_type" : "type-2434",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10442,10 +10458,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-2437",
+   "return_type" : "type-2427",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10455,7 +10471,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-1246"
@@ -10475,13 +10491,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2397",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10491,7 +10507,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-1050"
@@ -10507,7 +10523,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-1054"
@@ -10523,7 +10539,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-1280"
@@ -10539,7 +10555,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-103"
@@ -10558,7 +10574,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-123"
@@ -10574,13 +10590,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-2444",
+   "return_type" : "type-2434",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10772,13 +10788,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10788,13 +10804,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10804,10 +10820,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -10816,7 +10832,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10826,7 +10842,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     }
    ],
    "return_type" : "type-123",
@@ -10839,10 +10855,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-6",
@@ -10855,7 +10871,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     }
    ],
    "return_type" : "type-1299",
@@ -10868,7 +10884,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-286"
@@ -10888,10 +10904,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-286"
@@ -10911,7 +10927,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     }
    ],
    "return_type" : "type-1299",
@@ -10924,13 +10940,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10940,13 +10956,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10956,10 +10972,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -10968,7 +10984,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10978,7 +10994,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-227"
@@ -10997,7 +11013,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1284"
@@ -11013,7 +11029,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-103"
@@ -11032,7 +11048,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-122"
@@ -11048,13 +11064,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11064,13 +11080,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11080,10 +11096,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -11092,7 +11108,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11102,13 +11118,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11118,13 +11134,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11134,10 +11150,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -11146,7 +11162,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11157,7 +11173,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
@@ -11166,7 +11182,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11177,10 +11193,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -11192,7 +11208,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11203,16 +11219,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11222,7 +11238,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-103"
@@ -11231,7 +11247,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11242,7 +11258,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-227"
@@ -11262,7 +11278,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-227"
@@ -11282,7 +11298,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-227"
@@ -11305,7 +11321,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-227"
@@ -11328,7 +11344,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-227"
@@ -11351,7 +11367,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-227"
@@ -11506,7 +11522,7 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2401",
+   "referenced_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11631,8 +11647,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2404",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11658,8 +11674,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2386",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11676,8 +11692,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2433",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11946,8 +11962,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2452",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -11984,8 +12000,8 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2418",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2408",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -12005,8 +12021,8 @@
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2426",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12164,8 +12180,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2401",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2388",
+   "self_type" : "type-2392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12191,8 +12207,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2386",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12209,8 +12225,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12434,8 +12450,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2447",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2438",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12490,8 +12506,8 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2414",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -12606,8 +12622,8 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2483",
+   "referenced_type" : "type-2471",
+   "self_type" : "type-2473",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12807,8 +12823,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2672",
-   "self_type" : "type-2679",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2669",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12951,8 +12967,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2575",
-   "self_type" : "type-2574",
+   "referenced_type" : "type-2565",
+   "self_type" : "type-2564",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13122,8 +13138,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-2426",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2415",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13149,8 +13165,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-2407",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2395",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13158,8 +13174,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-2454",
-   "self_type" : "type-2453",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2443",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13167,8 +13183,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-2459",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13278,8 +13294,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2641",
-   "self_type" : "type-2640",
+   "referenced_type" : "type-2631",
+   "self_type" : "type-2630",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13287,8 +13303,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-2653",
+   "self_type" : "type-2652",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13332,8 +13348,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2631",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2621",
+   "self_type" : "type-2620",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13341,8 +13357,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2687",
+   "referenced_type" : "type-2678",
+   "self_type" : "type-2677",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13366,24 +13382,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::CallStack *",
-   "name" : "android::CallStack *",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2391",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::CallStack::StackDeleter *",
-   "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-2394",
-   "self_type" : "type-2395",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-979",
@@ -13585,7 +13583,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2400",
+   "self_type" : "type-2399",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13836,8 +13834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2467",
-   "self_type" : "type-2466",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13845,8 +13843,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2633",
-   "self_type" : "type-2632",
+   "referenced_type" : "type-2623",
+   "self_type" : "type-2622",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13854,8 +13852,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2658",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2648",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13935,8 +13933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2402",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13989,17 +13987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2385",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14043,8 +14032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2430",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14061,8 +14050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2422",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14880,8 +14869,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2436",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14889,8 +14878,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2457",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2447",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14986,15 +14975,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::CallStack *",
-   "name" : "const android::CallStack *",
-   "referenced_type" : "type-2392",
-   "self_type" : "type-2393",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace *",
    "name" : "const android::ColorSpace *",
    "referenced_type" : "type-1039",
@@ -15123,8 +15103,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15177,8 +15157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2401",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2388",
+   "self_type" : "type-2394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15213,17 +15193,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2386",
-   "self_type" : "type-2389",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::String8> *",
-   "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15735,8 +15706,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2447",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2441",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15744,8 +15715,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2455",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2445",
+   "self_type" : "type-2446",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16360,8 +16331,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2466",
-   "self_type" : "type-2465",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2455",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16370,8 +16341,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2632",
-   "self_type" : "type-2634",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16380,8 +16351,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2658",
-   "self_type" : "type-2660",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2650",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16483,8 +16454,8 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -16533,8 +16504,8 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2425",
+   "self_type" : "type-2424",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -16556,16 +16527,6 @@
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CallStack",
-   "name" : "const android::CallStack",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2392",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::ColorSpace",
@@ -16811,7 +16772,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2398",
+   "self_type" : "type-2397",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16870,8 +16831,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2388",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16910,18 +16871,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2386",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::String8>",
-   "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2384",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16970,8 +16921,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2431",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -17760,8 +17711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2437",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17770,8 +17721,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2455",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2445",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17853,8 +17804,8 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2412",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17995,8 +17946,8 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2482",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2471",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18250,8 +18201,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-2520",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2510",
+   "self_type" : "type-2509",
    "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"
   },
@@ -18440,8 +18391,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-2526",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2515",
    "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"
   },
@@ -18620,8 +18571,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-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
    "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"
   },
@@ -18790,8 +18741,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-2524",
-   "self_type" : "type-2523",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
    "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"
   },
@@ -18980,8 +18931,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-2530",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "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"
   },
@@ -19150,8 +19101,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-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2508",
+   "self_type" : "type-2507",
    "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"
   },
@@ -19330,8 +19281,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-2522",
-   "self_type" : "type-2521",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2511",
    "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"
   },
@@ -19520,8 +19471,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-2538",
-   "self_type" : "type-2537",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2527",
    "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"
   },
@@ -19700,8 +19651,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-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "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"
   },
@@ -19880,8 +19831,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-2540",
-   "self_type" : "type-2539",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "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"
   },
@@ -20060,8 +20011,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-2536",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2525",
    "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"
   },
@@ -20240,8 +20191,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-2544",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "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"
   },
@@ -20390,8 +20341,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-2556",
-   "self_type" : "type-2555",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2545",
    "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"
   },
@@ -20520,8 +20471,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-2554",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
    "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"
   },
@@ -20650,8 +20601,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-2552",
-   "self_type" : "type-2551",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
    "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"
   },
@@ -20780,8 +20731,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-2550",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2540",
+   "self_type" : "type-2539",
    "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"
   },
@@ -20910,8 +20861,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-2558",
-   "self_type" : "type-2557",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2547",
    "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"
   },
@@ -21120,8 +21071,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2402",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21160,8 +21111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2404",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21230,8 +21181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2663",
+   "self_type" : "type-2662",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21390,8 +21341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2576",
-   "self_type" : "type-2575",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2565",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21835,35 +21786,6 @@
    ]
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFrameLines",
-     "referenced_type" : "type-2380"
-    }
-   ],
-   "linker_set_key" : "android::CallStack",
-   "name" : "android::CallStack",
-   "record_kind" : "class",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStackE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CallStack::StackDeleter",
-   "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-2394",
-   "self_type" : "type-2394",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
@@ -22802,11 +22724,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2396",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2390",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2397" ],
+   "template_args" : [ "type-2389" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -23183,7 +23105,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2396"
+     "referenced_type" : "type-2390"
     }
    ],
    "fields" :
@@ -23191,14 +23113,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2384"
+     "referenced_type" : "type-2382"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2389",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -23629,8 +23551,8 @@
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2382",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -23791,61 +23713,6 @@
      "referenced_type" : "type-235"
     }
    ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2380",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-285" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-235"
-    }
-   ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
@@ -24210,28 +24077,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2410"
     },
     {
-     "referenced_type" : "type-2421"
+     "referenced_type" : "type-2411"
+    },
+    {
+     "referenced_type" : "type-2409"
+    },
+    {
+     "referenced_type" : "type-2417"
     },
     {
      "referenced_type" : "type-2419"
     },
     {
-     "referenced_type" : "type-2428"
+     "referenced_type" : "type-2421"
     },
     {
-     "referenced_type" : "type-2429"
+     "referenced_type" : "type-2420"
     },
     {
-     "referenced_type" : "type-2431"
-    },
-    {
-     "referenced_type" : "type-2430"
-    },
-    {
-     "referenced_type" : "type-2433"
+     "referenced_type" : "type-2423"
     }
    ],
    "fields" :
@@ -24239,14 +24106,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2428"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2427",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -24269,8 +24136,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-2433",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24293,8 +24160,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-2430",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24317,8 +24184,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-2428",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2417",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24341,8 +24208,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-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24365,8 +24232,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-2431",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25751,8 +25618,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-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2409",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25883,8 +25750,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-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26267,8 +26134,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-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2410",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -29101,8 +28968,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2408",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30014,8 +29881,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2401",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30083,7 +29950,7 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2445"
+     "referenced_type" : "type-2435"
     },
     {
      "access" : "private",
@@ -30095,8 +29962,8 @@
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2444",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -30113,8 +29980,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2445",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -30124,13 +29991,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2411"
+     "referenced_type" : "type-2381"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2380",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
diff --git a/Q/64/arm64_armv8-a/source-based/libstagefright_bufferpool@2.0.so.lsdump b/Q/64/arm64_armv8-a/source-based/libstagefright_bufferpool@2.0.so.lsdump
index f94b46a..a214b26 100644
--- a/Q/64/arm64_armv8-a/source-based/libstagefright_bufferpool@2.0.so.lsdump
+++ b/Q/64/arm64_armv8-a/source-based/libstagefright_bufferpool@2.0.so.lsdump
@@ -193,6 +193,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2EmP13native_handlemb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEaSERKS7_"
   },
   {
@@ -201,6 +205,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2EmP13native_handlemb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEaSERKS7_"
   },
   {
@@ -213,10 +221,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE17unmapGrantorDescrEPvj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE4readEPS5_m"
   },
   {
@@ -245,10 +249,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE17unmapGrantorDescrEPvj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE4readEPS5_m"
   },
   {
@@ -1746,6 +1746,32 @@
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
   },
   {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2EmP13native_handlemb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-270"
+    },
+    {
+     "referenced_type" : "type-17"
+    },
+    {
+     "referenced_type" : "type-36"
+    },
+    {
+     "referenced_type" : "type-17"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-88"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
    "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::operator=",
    "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEaSERKS7_",
    "parameters" :
@@ -1784,6 +1810,32 @@
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
   },
   {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2EmP13native_handlemb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-279"
+    },
+    {
+     "referenced_type" : "type-17"
+    },
+    {
+     "referenced_type" : "type-36"
+    },
+    {
+     "referenced_type" : "type-17"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-88"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
    "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::operator=",
    "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEaSERKS7_",
    "parameters" :
@@ -1834,26 +1886,6 @@
    "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::unmapGrantorDescr",
-   "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE17unmapGrantorDescrEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-446"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-16"
-    }
-   ],
-   "return_type" : "type-70",
-   "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
-  },
-  {
    "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::read",
    "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE4readEPS5_m",
    "parameters" :
@@ -1979,26 +2011,6 @@
    "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::unmapGrantorDescr",
-   "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE17unmapGrantorDescrEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-447"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-16"
-    }
-   ],
-   "return_type" : "type-70",
-   "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
-  },
-  {
    "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::read",
    "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE4readEPS5_m",
    "parameters" :
@@ -7118,8 +7130,8 @@
     }
    ],
    "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-13",
    "self_type" : "type-13",
@@ -7178,8 +7190,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-230",
    "self_type" : "type-230",
@@ -7220,8 +7232,8 @@
     }
    ],
    "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-225",
    "self_type" : "type-225",
@@ -7262,8 +7274,8 @@
     }
    ],
    "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-266",
    "self_type" : "type-266",
diff --git a/Q/64/arm64_armv8-a/source-based/libui.so.lsdump b/Q/64/arm64_armv8-a/source-based/libui.so.lsdump
index 77dae8d..00e04b0 100644
--- a/Q/64/arm64_armv8-a/source-based/libui.so.lsdump
+++ b/Q/64/arm64_armv8-a/source-based/libui.so.lsdump
@@ -24,7 +24,7 @@
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
    "referenced_type" : "type-218",
-   "self_type" : "type-2439",
+   "self_type" : "type-2429",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -1179,6 +1179,9 @@
    "name" : "_ZNK7android17Gralloc3Allocator8isLoadedEv"
   },
   {
+   "name" : "_ZNK7android22GraphicBufferAllocator12getTotalSizeEv"
+  },
+  {
    "name" : "_ZNK7android22GraphicBufferAllocator4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
   },
   {
@@ -2190,8 +2193,8 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "underlying_type" : "type-123",
@@ -4427,8 +4430,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2450",
-   "self_type" : "type-2450",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "underlying_type" : "type-123",
@@ -4461,8 +4464,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2451",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "underlying_type" : "type-123",
@@ -7931,7 +7934,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2459"
+     "referenced_type" : "type-2449"
     }
    ],
    "return_type" : "type-150",
@@ -8088,7 +8091,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     },
     {
      "referenced_type" : "type-10"
@@ -8107,7 +8110,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     },
     {
      "referenced_type" : "type-10"
@@ -8132,7 +8135,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     },
     {
      "referenced_type" : "type-123"
@@ -8154,7 +8157,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     }
    ],
    "return_type" : "type-150",
@@ -8193,10 +8196,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     },
     {
-     "referenced_type" : "type-2449"
+     "referenced_type" : "type-2439"
     }
    ],
    "return_type" : "type-150",
@@ -8209,7 +8212,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     },
     {
      "referenced_type" : "type-123"
@@ -8225,7 +8228,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     }
    ],
    "return_type" : "type-150",
@@ -8238,10 +8241,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     },
     {
-     "referenced_type" : "type-2449"
+     "referenced_type" : "type-2439"
     }
    ],
    "return_type" : "type-150",
@@ -8254,7 +8257,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     },
     {
      "referenced_type" : "type-123"
@@ -8270,7 +8273,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     }
    ],
    "return_type" : "type-150",
@@ -8283,7 +8286,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     }
    ],
    "return_type" : "type-150",
@@ -8296,7 +8299,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     }
    ],
    "return_type" : "type-150",
@@ -8309,13 +8312,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     },
     {
-     "referenced_type" : "type-2449"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-2453",
+   "return_type" : "type-2443",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8558,13 +8561,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8574,13 +8577,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8590,10 +8593,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -8602,7 +8605,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8613,7 +8616,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
@@ -8622,7 +8625,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8633,10 +8636,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -8648,7 +8651,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8659,16 +8662,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8678,7 +8681,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -8687,7 +8690,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8697,10 +8700,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8710,7 +8713,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -8738,10 +8741,10 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
@@ -8760,10 +8763,10 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
@@ -8788,13 +8791,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
    "return_type" : "type-150",
@@ -8810,13 +8813,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -8834,10 +8837,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2398",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8847,7 +8850,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
@@ -8863,7 +8866,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -8882,7 +8885,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-123"
@@ -8901,7 +8904,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-150",
@@ -8914,13 +8917,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8930,13 +8933,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8946,10 +8949,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -8958,7 +8961,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8968,13 +8971,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8984,13 +8987,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9000,10 +9003,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -9012,7 +9015,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9022,13 +9025,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9038,13 +9041,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9054,10 +9057,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -9066,7 +9069,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9076,7 +9079,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-288"
@@ -9096,7 +9099,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-10"
@@ -9105,7 +9108,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9115,10 +9118,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -9137,7 +9140,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-103"
@@ -9156,7 +9159,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1120"
@@ -9175,7 +9178,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
@@ -9191,10 +9194,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
    "return_type" : "type-150",
@@ -9207,7 +9210,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-150",
@@ -9220,7 +9223,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
@@ -9236,10 +9239,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
    "return_type" : "type-150",
@@ -9252,7 +9255,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-150",
@@ -9265,7 +9268,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-150",
@@ -9278,7 +9281,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-150",
@@ -9291,13 +9294,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10245,6 +10248,19 @@
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
+   "function_name" : "android::GraphicBufferAllocator::getTotalSize",
+   "linker_set_key" : "_ZNK7android22GraphicBufferAllocator12getTotalSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-721"
+    }
+   ],
+   "return_type" : "type-124",
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
+  },
+  {
    "function_name" : "android::GraphicBufferAllocator::dump",
    "linker_set_key" : "_ZNK7android22GraphicBufferAllocator4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE",
    "parameters" :
@@ -10267,7 +10283,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
      "referenced_type" : "type-103"
@@ -10286,7 +10302,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
    "return_type" : "type-6",
@@ -10299,7 +10315,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
    "return_type" : "type-123",
@@ -10312,7 +10328,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
    "return_type" : "type-10",
@@ -10325,7 +10341,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
    "return_type" : "type-10",
@@ -10338,7 +10354,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
    "return_type" : "type-10",
@@ -10351,7 +10367,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
    "return_type" : "type-10",
@@ -10364,7 +10380,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
      "referenced_type" : "type-288"
@@ -10380,10 +10396,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
-     "referenced_type" : "type-2454"
+     "referenced_type" : "type-2444"
     },
     {
      "referenced_type" : "type-288"
@@ -10400,7 +10416,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
    "return_type" : "type-123",
@@ -10413,7 +10429,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
    "return_type" : "type-123",
@@ -10426,10 +10442,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
-   "return_type" : "type-2445",
+   "return_type" : "type-2435",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10439,10 +10455,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
-   "return_type" : "type-2438",
+   "return_type" : "type-2428",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10452,7 +10468,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
      "referenced_type" : "type-1246"
@@ -10472,13 +10488,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2398",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10488,7 +10504,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
      "referenced_type" : "type-1051"
@@ -10504,7 +10520,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
      "referenced_type" : "type-1055"
@@ -10520,7 +10536,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
      "referenced_type" : "type-1279"
@@ -10536,7 +10552,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
      "referenced_type" : "type-103"
@@ -10555,7 +10571,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
      "referenced_type" : "type-124"
@@ -10571,13 +10587,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
-     "referenced_type" : "type-2449"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-2445",
+   "return_type" : "type-2435",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10769,13 +10785,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10785,13 +10801,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10801,10 +10817,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -10813,7 +10829,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10823,7 +10839,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     }
    ],
    "return_type" : "type-124",
@@ -10836,10 +10852,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
    "return_type" : "type-6",
@@ -10852,7 +10868,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     }
    ],
    "return_type" : "type-1297",
@@ -10865,7 +10881,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-288"
@@ -10885,10 +10901,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2408"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-288"
@@ -10908,7 +10924,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     }
    ],
    "return_type" : "type-1297",
@@ -10921,13 +10937,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10937,13 +10953,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10953,10 +10969,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -10965,7 +10981,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10975,7 +10991,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-217"
@@ -10994,7 +11010,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1283"
@@ -11010,7 +11026,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-103"
@@ -11029,10 +11045,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2407"
+     "referenced_type" : "type-2396"
     }
    ],
    "return_type" : "type-1297",
@@ -11045,13 +11061,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11061,13 +11077,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11077,10 +11093,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -11089,7 +11105,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11099,13 +11115,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11115,13 +11131,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11131,10 +11147,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -11143,7 +11159,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11154,7 +11170,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1246"
@@ -11163,7 +11179,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11174,10 +11190,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -11189,7 +11205,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11200,16 +11216,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11219,7 +11235,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-103"
@@ -11228,7 +11244,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11239,7 +11255,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2388"
     },
     {
      "referenced_type" : "type-217"
@@ -11259,7 +11275,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2388"
     },
     {
      "referenced_type" : "type-217"
@@ -11279,7 +11295,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2388"
     },
     {
      "referenced_type" : "type-217"
@@ -11302,7 +11318,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2388"
     },
     {
      "referenced_type" : "type-217"
@@ -11325,7 +11341,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2388"
     },
     {
      "referenced_type" : "type-217"
@@ -11348,7 +11364,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2388"
     },
     {
      "referenced_type" : "type-217"
@@ -11503,7 +11519,7 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2402",
+   "referenced_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11628,8 +11644,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2394",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11655,8 +11671,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2387",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11673,8 +11689,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2444",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2434",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11943,8 +11959,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2453",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2443",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -11981,8 +11997,8 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2410",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -12002,8 +12018,8 @@
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2425",
+   "self_type" : "type-2427",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12161,8 +12177,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2404",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2393",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12188,8 +12204,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2387",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2386",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12206,8 +12222,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2442",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2433",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12431,8 +12447,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2449",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2439",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12487,8 +12503,8 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2416",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -12610,8 +12626,8 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2483",
-   "self_type" : "type-2485",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2475",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12804,8 +12820,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2681",
+   "referenced_type" : "type-2663",
+   "self_type" : "type-2671",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12948,8 +12964,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2576",
-   "self_type" : "type-2575",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2565",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13119,8 +13135,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13146,8 +13162,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2397",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13155,8 +13171,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2455",
-   "self_type" : "type-2454",
+   "referenced_type" : "type-2445",
+   "self_type" : "type-2444",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13164,8 +13180,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2460",
-   "self_type" : "type-2459",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2449",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13275,8 +13291,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2641",
-   "self_type" : "type-2640",
+   "referenced_type" : "type-2631",
+   "self_type" : "type-2630",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13284,8 +13300,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-2654",
+   "self_type" : "type-2653",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13329,8 +13345,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2632",
-   "self_type" : "type-2631",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2621",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13338,8 +13354,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2690",
-   "self_type" : "type-2689",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2679",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13363,24 +13379,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::CallStack *",
-   "name" : "android::CallStack *",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2392",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::CallStack::StackDeleter *",
-   "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2396",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-980",
@@ -13833,8 +13831,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2468",
-   "self_type" : "type-2467",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2457",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13842,8 +13840,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2634",
-   "self_type" : "type-2633",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2623",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13851,8 +13849,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2660",
-   "self_type" : "type-2659",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2649",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13932,8 +13930,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2392",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13986,17 +13984,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2386",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2384",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14040,8 +14029,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2431",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14058,8 +14047,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2423",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14877,8 +14866,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2437",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14886,8 +14875,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2446",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2448",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14983,15 +14972,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::CallStack *",
-   "name" : "const android::CallStack *",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2394",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const android::ColorSpace *",
    "name" : "const android::ColorSpace *",
    "referenced_type" : "type-1040",
@@ -15174,8 +15154,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2395",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15210,17 +15190,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2387",
-   "self_type" : "type-2390",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::String8> *",
-   "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2388",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15732,8 +15703,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2452",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2442",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15741,8 +15712,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2457",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2447",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16111,7 +16082,7 @@
    "linker_set_key" : "unsigned long *",
    "name" : "unsigned long *",
    "referenced_type" : "type-124",
-   "self_type" : "type-2407",
+   "self_type" : "type-2396",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16366,8 +16337,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2467",
-   "self_type" : "type-2466",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2456",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16376,8 +16347,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2633",
-   "self_type" : "type-2635",
+   "referenced_type" : "type-2623",
+   "self_type" : "type-2625",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16386,8 +16357,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2661",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2651",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16489,8 +16460,8 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2418",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -16539,8 +16510,8 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2425",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -16562,16 +16533,6 @@
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::CallStack",
-   "name" : "const android::CallStack",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2393",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
    "alignment" : 16,
    "is_const" : true,
    "linker_set_key" : "const android::ColorSpace",
@@ -16876,8 +16837,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2402",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2389",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16916,18 +16877,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2387",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::String8>",
-   "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2385",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16976,8 +16927,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2432",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -17766,8 +17717,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2438",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17776,8 +17727,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2446",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2446",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17859,8 +17810,8 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2425",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2414",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -18009,8 +17960,8 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2484",
-   "self_type" : "type-2483",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18256,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-2522",
-   "self_type" : "type-2521",
+   "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"
   },
@@ -18446,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-2528",
-   "self_type" : "type-2527",
+   "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"
   },
@@ -18626,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-2530",
-   "self_type" : "type-2529",
+   "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"
   },
@@ -18806,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-2526",
-   "self_type" : "type-2525",
+   "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"
   },
@@ -18986,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-2532",
-   "self_type" : "type-2531",
+   "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"
   },
@@ -19156,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-2520",
-   "self_type" : "type-2519",
+   "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"
   },
@@ -19336,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-2524",
-   "self_type" : "type-2523",
+   "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"
   },
@@ -19526,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-2540",
-   "self_type" : "type-2539",
+   "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"
   },
@@ -19706,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-2544",
-   "self_type" : "type-2543",
+   "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"
   },
@@ -19886,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-2542",
-   "self_type" : "type-2541",
+   "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"
   },
@@ -20066,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-2538",
-   "self_type" : "type-2537",
+   "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"
   },
@@ -20246,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-2546",
-   "self_type" : "type-2545",
+   "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"
   },
@@ -20396,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-2558",
-   "self_type" : "type-2557",
+   "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"
   },
@@ -20526,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-2556",
-   "self_type" : "type-2555",
+   "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"
   },
@@ -20656,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-2554",
-   "self_type" : "type-2553",
+   "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"
   },
@@ -20786,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-2552",
-   "self_type" : "type-2551",
+   "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"
   },
@@ -20916,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-2560",
-   "self_type" : "type-2559",
+   "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"
   },
@@ -21126,8 +21077,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2404",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21166,8 +21117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21236,8 +21187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2674",
-   "self_type" : "type-2673",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2663",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21396,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-2577",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2566",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21851,35 +21802,6 @@
    ]
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFrameLines",
-     "referenced_type" : "type-2381"
-    }
-   ],
-   "linker_set_key" : "android::CallStack",
-   "name" : "android::CallStack",
-   "record_kind" : "class",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2391",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStackE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CallStack::StackDeleter",
-   "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2395",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
-  },
-  {
    "alignment" : 16,
    "fields" :
    [
@@ -22818,11 +22740,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2391",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2398" ],
+   "template_args" : [ "type-2390" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -23199,7 +23121,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2397"
+     "referenced_type" : "type-2391"
     }
    ],
    "fields" :
@@ -23207,14 +23129,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2385"
+     "referenced_type" : "type-2383"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2390",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -23645,8 +23567,8 @@
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2383",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -23807,61 +23729,6 @@
      "referenced_type" : "type-236"
     }
    ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2381",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-287" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-236"
-    }
-   ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
@@ -24226,28 +24093,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2422"
+     "referenced_type" : "type-2412"
     },
     {
-     "referenced_type" : "type-2423"
+     "referenced_type" : "type-2413"
+    },
+    {
+     "referenced_type" : "type-2411"
+    },
+    {
+     "referenced_type" : "type-2419"
+    },
+    {
+     "referenced_type" : "type-2420"
+    },
+    {
+     "referenced_type" : "type-2422"
     },
     {
      "referenced_type" : "type-2421"
     },
     {
-     "referenced_type" : "type-2429"
-    },
-    {
-     "referenced_type" : "type-2430"
-    },
-    {
-     "referenced_type" : "type-2432"
-    },
-    {
-     "referenced_type" : "type-2431"
-    },
-    {
-     "referenced_type" : "type-2434"
+     "referenced_type" : "type-2424"
     }
    ],
    "fields" :
@@ -24255,14 +24122,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2429"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2428",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -24285,8 +24152,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-2434",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24309,8 +24176,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-2431",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24333,8 +24200,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-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24357,8 +24224,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-2430",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24381,8 +24248,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-2432",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25767,8 +25634,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-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25899,8 +25766,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-2423",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26283,8 +26150,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-2422",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -29117,8 +28984,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30030,8 +29897,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30099,7 +29966,7 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
      "access" : "private",
@@ -30111,8 +29978,8 @@
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2445",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -30129,8 +29996,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2446",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -30140,13 +30007,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2413"
+     "referenced_type" : "type-2382"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2381",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
diff --git a/Q/64/arm_armv7-a-neon/source-based/libstagefright_bufferpool@2.0.so.lsdump b/Q/64/arm_armv7-a-neon/source-based/libstagefright_bufferpool@2.0.so.lsdump
index f650c65..98205a7 100644
--- a/Q/64/arm_armv7-a-neon/source-based/libstagefright_bufferpool@2.0.so.lsdump
+++ b/Q/64/arm_armv7-a-neon/source-based/libstagefright_bufferpool@2.0.so.lsdump
@@ -197,10 +197,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2EjP13native_handlejb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEaSERKS7_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2EjP13native_handlejb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEaSERKS7_"
   },
   {
@@ -213,10 +229,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE17unmapGrantorDescrEPvj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE4readEPS5_j"
   },
   {
@@ -245,10 +257,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE17unmapGrantorDescrEPvj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE4readEPS5_j"
   },
   {
@@ -1733,6 +1741,54 @@
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-347"
+    },
+    {
+     "referenced_type" : "type-359"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2EjP13native_handlejb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-347"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-87"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
    "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::operator=",
    "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEaSERKS7_",
    "parameters" :
@@ -1749,6 +1805,54 @@
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
   },
   {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-368"
+    },
+    {
+     "referenced_type" : "type-359"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2EjP13native_handlejb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-368"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-87"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
    "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::operator=",
    "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEaSERKS7_",
    "parameters" :
@@ -1799,26 +1903,6 @@
    "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::unmapGrantorDescr",
-   "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE17unmapGrantorDescrEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-619"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-13"
-    }
-   ],
-   "return_type" : "type-70",
-   "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
-  },
-  {
    "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::read",
    "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE4readEPS5_j",
    "parameters" :
@@ -1944,26 +2028,6 @@
    "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::unmapGrantorDescr",
-   "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE17unmapGrantorDescrEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-620"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-13"
-    }
-   ],
-   "return_type" : "type-70",
-   "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
-  },
-  {
    "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::read",
    "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE4readEPS5_j",
    "parameters" :
@@ -8000,8 +8064,8 @@
     }
    ],
    "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-10",
    "self_type" : "type-10",
@@ -8060,8 +8124,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-254",
    "self_type" : "type-254",
@@ -8102,8 +8166,8 @@
     }
    ],
    "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-242",
    "self_type" : "type-242",
@@ -8144,8 +8208,8 @@
     }
    ],
    "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-338",
    "self_type" : "type-338",
diff --git a/Q/64/arm_armv7-a-neon/source-based/libui.so.lsdump b/Q/64/arm_armv7-a-neon/source-based/libui.so.lsdump
index dd4261a..20c7f22 100644
--- a/Q/64/arm_armv7-a-neon/source-based/libui.so.lsdump
+++ b/Q/64/arm_armv7-a-neon/source-based/libui.so.lsdump
@@ -24,7 +24,7 @@
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
    "referenced_type" : "type-200",
-   "self_type" : "type-2288",
+   "self_type" : "type-2277",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -1179,6 +1179,9 @@
    "name" : "_ZNK7android17Gralloc3Allocator8isLoadedEv"
   },
   {
+   "name" : "_ZNK7android22GraphicBufferAllocator12getTotalSizeEv"
+  },
+  {
    "name" : "_ZNK7android22GraphicBufferAllocator4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
   },
   {
@@ -2236,8 +2239,8 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "underlying_type" : "type-123",
@@ -4473,8 +4476,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2289",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "underlying_type" : "type-123",
@@ -4507,8 +4510,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2300",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2290",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "underlying_type" : "type-123",
@@ -7977,7 +7980,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2308"
+     "referenced_type" : "type-2298"
     }
    ],
    "return_type" : "type-151",
@@ -8134,7 +8137,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     },
     {
      "referenced_type" : "type-10"
@@ -8153,7 +8156,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     },
     {
      "referenced_type" : "type-10"
@@ -8178,7 +8181,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     },
     {
      "referenced_type" : "type-123"
@@ -8200,7 +8203,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     }
    ],
    "return_type" : "type-151",
@@ -8239,10 +8242,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     },
     {
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2288"
     }
    ],
    "return_type" : "type-151",
@@ -8255,7 +8258,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     },
     {
      "referenced_type" : "type-123"
@@ -8271,7 +8274,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     }
    ],
    "return_type" : "type-151",
@@ -8284,10 +8287,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     },
     {
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2288"
     }
    ],
    "return_type" : "type-151",
@@ -8300,7 +8303,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     },
     {
      "referenced_type" : "type-123"
@@ -8316,7 +8319,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     }
    ],
    "return_type" : "type-151",
@@ -8329,7 +8332,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     }
    ],
    "return_type" : "type-151",
@@ -8342,7 +8345,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     }
    ],
    "return_type" : "type-151",
@@ -8355,13 +8358,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2296"
+     "referenced_type" : "type-2285"
     },
     {
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-2302",
+   "return_type" : "type-2292",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8604,13 +8607,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8620,13 +8623,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8636,10 +8639,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -8648,7 +8651,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8659,7 +8662,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-1246"
@@ -8668,7 +8671,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8679,10 +8682,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -8694,7 +8697,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8705,16 +8708,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8724,7 +8727,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-103"
@@ -8733,7 +8736,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8743,10 +8746,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8756,7 +8759,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-103"
@@ -8784,10 +8787,10 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2225"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-1246"
@@ -8806,10 +8809,10 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2225"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-1246"
@@ -8834,13 +8837,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2225"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
    "return_type" : "type-151",
@@ -8856,13 +8859,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2225"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -8880,10 +8883,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2229",
+   "return_type" : "type-2221",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8893,7 +8896,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-1246"
@@ -8909,7 +8912,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-103"
@@ -8928,7 +8931,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-123"
@@ -8947,7 +8950,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     }
    ],
    "return_type" : "type-151",
@@ -8960,13 +8963,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8976,13 +8979,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8992,10 +8995,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -9004,7 +9007,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9014,13 +9017,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9030,13 +9033,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9046,10 +9049,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -9058,7 +9061,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9068,13 +9071,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9084,13 +9087,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9100,10 +9103,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -9112,7 +9115,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9122,7 +9125,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-286"
@@ -9142,7 +9145,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-10"
@@ -9151,7 +9154,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9161,10 +9164,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2225"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -9183,7 +9186,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2238"
+     "referenced_type" : "type-2225"
     },
     {
      "referenced_type" : "type-103"
@@ -9202,7 +9205,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-1119"
@@ -9221,7 +9224,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-1246"
@@ -9237,10 +9240,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
    "return_type" : "type-151",
@@ -9253,7 +9256,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     }
    ],
    "return_type" : "type-151",
@@ -9266,7 +9269,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-1246"
@@ -9282,10 +9285,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
    "return_type" : "type-151",
@@ -9298,7 +9301,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     }
    ],
    "return_type" : "type-151",
@@ -9311,7 +9314,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     }
    ],
    "return_type" : "type-151",
@@ -9324,7 +9327,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     }
    ],
    "return_type" : "type-151",
@@ -9337,13 +9340,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2236"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2238",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10291,6 +10294,19 @@
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
+   "function_name" : "android::GraphicBufferAllocator::getTotalSize",
+   "linker_set_key" : "_ZNK7android22GraphicBufferAllocator12getTotalSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-721"
+    }
+   ],
+   "return_type" : "type-123",
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
+  },
+  {
    "function_name" : "android::GraphicBufferAllocator::dump",
    "linker_set_key" : "_ZNK7android22GraphicBufferAllocator4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE",
    "parameters" :
@@ -10313,7 +10329,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-103"
@@ -10332,7 +10348,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-6",
@@ -10345,7 +10361,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-123",
@@ -10358,7 +10374,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-10",
@@ -10371,7 +10387,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-10",
@@ -10384,7 +10400,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-10",
@@ -10397,7 +10413,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-10",
@@ -10410,7 +10426,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-286"
@@ -10426,10 +10442,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
-     "referenced_type" : "type-2303"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-286"
@@ -10446,7 +10462,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-123",
@@ -10459,7 +10475,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-123",
@@ -10472,10 +10488,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
-   "return_type" : "type-2294",
+   "return_type" : "type-2283",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10485,10 +10501,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     }
    ],
-   "return_type" : "type-2287",
+   "return_type" : "type-2276",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10498,7 +10514,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-1246"
@@ -10518,13 +10534,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2229",
+   "return_type" : "type-2221",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10534,7 +10550,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-1050"
@@ -10550,7 +10566,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-1054"
@@ -10566,7 +10582,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-1280"
@@ -10582,7 +10598,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-103"
@@ -10601,7 +10617,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-123"
@@ -10617,13 +10633,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2301"
+     "referenced_type" : "type-2291"
     },
     {
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-2294",
+   "return_type" : "type-2283",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10815,13 +10831,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10831,13 +10847,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10847,10 +10863,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -10859,7 +10875,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10869,7 +10885,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     }
    ],
    "return_type" : "type-123",
@@ -10882,10 +10898,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
    "return_type" : "type-6",
@@ -10898,7 +10914,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     }
    ],
    "return_type" : "type-1299",
@@ -10911,7 +10927,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-286"
@@ -10931,10 +10947,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2241"
+     "referenced_type" : "type-2228"
     },
     {
      "referenced_type" : "type-286"
@@ -10954,7 +10970,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     }
    ],
    "return_type" : "type-1299",
@@ -10967,13 +10983,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10983,13 +10999,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10999,10 +11015,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -11011,7 +11027,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11021,7 +11037,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-227"
@@ -11040,7 +11056,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1284"
@@ -11056,7 +11072,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-103"
@@ -11075,7 +11091,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-122"
@@ -11091,13 +11107,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11107,13 +11123,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11123,10 +11139,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -11135,7 +11151,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11145,13 +11161,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11161,13 +11177,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11177,10 +11193,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -11189,7 +11205,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11200,7 +11216,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
@@ -11209,7 +11225,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11220,10 +11236,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -11235,7 +11251,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11246,16 +11262,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2237"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11265,7 +11281,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2239"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-103"
@@ -11274,7 +11290,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2235",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11549,7 +11565,7 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2235",
+   "referenced_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11674,8 +11690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2225",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11701,8 +11717,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11719,8 +11735,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2282",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11881,8 +11897,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2638",
-   "self_type" : "type-2637",
+   "referenced_type" : "type-2627",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11890,8 +11906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2852",
-   "self_type" : "type-2851",
+   "referenced_type" : "type-2841",
+   "self_type" : "type-2840",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11899,8 +11915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2928",
-   "self_type" : "type-2927",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2916",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12007,8 +12023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2302",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2292",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12032,35 +12048,35 @@
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
    "referenced_type" : "type-2204",
-   "self_type" : "type-2234",
+   "self_type" : "type-2230",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2251",
    "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-2751",
-   "self_type" : "type-2753",
+   "referenced_type" : "type-2740",
+   "self_type" : "type-2742",
    "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-3113",
-   "self_type" : "type-3145",
+   "referenced_type" : "type-3102",
+   "self_type" : "type-3134",
    "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-3386",
-   "self_type" : "type-3388",
+   "referenced_type" : "type-3368",
+   "self_type" : "type-3370",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -12073,29 +12089,29 @@
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2275",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2742",
-   "self_type" : "type-2744",
+   "referenced_type" : "type-2731",
+   "self_type" : "type-2733",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-3026",
-   "self_type" : "type-3036",
+   "referenced_type" : "type-3015",
+   "self_type" : "type-3025",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-3396",
-   "self_type" : "type-3398",
+   "referenced_type" : "type-3378",
+   "self_type" : "type-3380",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12190,8 +12206,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3039",
-   "self_type" : "type-3038",
+   "referenced_type" : "type-3028",
+   "self_type" : "type-3027",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12199,8 +12215,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3205",
-   "self_type" : "type-3204",
+   "referenced_type" : "type-3194",
+   "self_type" : "type-3193",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12208,8 +12224,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3209",
-   "self_type" : "type-3208",
+   "referenced_type" : "type-3198",
+   "self_type" : "type-3197",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12280,8 +12296,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2237",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2224",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12307,8 +12323,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12325,8 +12341,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2291",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2281",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12550,8 +12566,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2288",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12592,36 +12608,36 @@
   {
    "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-2267",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2258",
    "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-2270",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2264",
    "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-2754",
-   "self_type" : "type-2756",
+   "referenced_type" : "type-2743",
+   "self_type" : "type-2745",
    "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-3189",
-   "self_type" : "type-3201",
+   "referenced_type" : "type-3178",
+   "self_type" : "type-3190",
    "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-3389",
-   "self_type" : "type-3391",
+   "referenced_type" : "type-3371",
+   "self_type" : "type-3373",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -12715,92 +12731,92 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2332",
-   "self_type" : "type-2334",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2324",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2556",
-   "self_type" : "type-2558",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2547",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2591",
-   "self_type" : "type-2593",
+   "referenced_type" : "type-2580",
+   "self_type" : "type-2582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2766",
-   "self_type" : "type-2768",
+   "referenced_type" : "type-2755",
+   "self_type" : "type-2757",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2827",
-   "self_type" : "type-2829",
+   "referenced_type" : "type-2816",
+   "self_type" : "type-2818",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2846",
-   "self_type" : "type-2848",
+   "referenced_type" : "type-2835",
+   "self_type" : "type-2837",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2913",
-   "self_type" : "type-2915",
+   "referenced_type" : "type-2902",
+   "self_type" : "type-2904",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3059",
-   "self_type" : "type-3061",
+   "referenced_type" : "type-3048",
+   "self_type" : "type-3050",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3150",
-   "self_type" : "type-3153",
+   "referenced_type" : "type-3139",
+   "self_type" : "type-3142",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3227",
-   "self_type" : "type-3229",
+   "referenced_type" : "type-3216",
+   "self_type" : "type-3218",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3269",
-   "self_type" : "type-3271",
+   "referenced_type" : "type-3258",
+   "self_type" : "type-3260",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3320",
-   "self_type" : "type-3322",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3311",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3437",
-   "self_type" : "type-3439",
+   "referenced_type" : "type-3419",
+   "self_type" : "type-3421",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12919,8 +12935,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-2748",
-   "self_type" : "type-2750",
+   "referenced_type" : "type-2737",
+   "self_type" : "type-2739",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12928,8 +12944,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-3101",
-   "self_type" : "type-3109",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3098",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12955,8 +12971,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-2745",
-   "self_type" : "type-2747",
+   "referenced_type" : "type-2734",
+   "self_type" : "type-2736",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12964,8 +12980,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-3083",
-   "self_type" : "type-3093",
+   "referenced_type" : "type-3072",
+   "self_type" : "type-3082",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12982,8 +12998,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2287",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12991,8 +13007,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2757",
-   "self_type" : "type-2759",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2748",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13000,8 +13016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-3202",
-   "self_type" : "type-3207",
+   "referenced_type" : "type-3191",
+   "self_type" : "type-3196",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13018,8 +13034,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2523",
-   "self_type" : "type-2530",
+   "referenced_type" : "type-2513",
+   "self_type" : "type-2520",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13027,8 +13043,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2819",
-   "self_type" : "type-2821",
+   "referenced_type" : "type-2808",
+   "self_type" : "type-2810",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13036,8 +13052,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-3628",
-   "self_type" : "type-3635",
+   "referenced_type" : "type-3610",
+   "self_type" : "type-3617",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13054,8 +13070,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-3310",
-   "self_type" : "type-3312",
+   "referenced_type" : "type-3299",
+   "self_type" : "type-3301",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -13162,8 +13178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2415",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13171,8 +13187,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2561",
-   "self_type" : "type-2560",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2549",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13180,8 +13196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2692",
-   "self_type" : "type-2691",
+   "referenced_type" : "type-2681",
+   "self_type" : "type-2680",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13189,8 +13205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2805",
-   "self_type" : "type-2804",
+   "referenced_type" : "type-2794",
+   "self_type" : "type-2793",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13198,8 +13214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2831",
-   "self_type" : "type-2830",
+   "referenced_type" : "type-2820",
+   "self_type" : "type-2819",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13207,8 +13223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2882",
-   "self_type" : "type-2881",
+   "referenced_type" : "type-2871",
+   "self_type" : "type-2870",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13216,8 +13232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2973",
-   "self_type" : "type-2972",
+   "referenced_type" : "type-2962",
+   "self_type" : "type-2961",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13225,8 +13241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3054",
-   "self_type" : "type-3053",
+   "referenced_type" : "type-3043",
+   "self_type" : "type-3042",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13234,8 +13250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3129",
-   "self_type" : "type-3128",
+   "referenced_type" : "type-3118",
+   "self_type" : "type-3117",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13243,8 +13259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3212",
-   "self_type" : "type-3211",
+   "referenced_type" : "type-3201",
+   "self_type" : "type-3200",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13261,8 +13277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3307",
-   "self_type" : "type-3306",
+   "referenced_type" : "type-3296",
+   "self_type" : "type-3295",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13270,8 +13286,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3358",
-   "self_type" : "type-3357",
+   "referenced_type" : "type-3347",
+   "self_type" : "type-3346",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13279,8 +13295,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3531",
-   "self_type" : "type-3530",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3512",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13432,8 +13448,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-2273",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13441,8 +13457,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-2733",
-   "self_type" : "type-2732",
+   "referenced_type" : "type-2722",
+   "self_type" : "type-2721",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13450,8 +13466,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-2834",
-   "self_type" : "type-2833",
+   "referenced_type" : "type-2823",
+   "self_type" : "type-2822",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13459,8 +13475,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-3393",
-   "self_type" : "type-3392",
+   "referenced_type" : "type-3375",
+   "self_type" : "type-3374",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13486,8 +13502,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-2242",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2228",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13495,8 +13511,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-2304",
-   "self_type" : "type-2303",
+   "referenced_type" : "type-2294",
+   "self_type" : "type-2293",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13504,8 +13520,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-2309",
-   "self_type" : "type-2308",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2298",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13513,8 +13529,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-3127",
-   "self_type" : "type-3126",
+   "referenced_type" : "type-3116",
+   "self_type" : "type-3115",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13522,8 +13538,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-3381",
-   "self_type" : "type-3380",
+   "referenced_type" : "type-3360",
+   "self_type" : "type-3359",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13531,8 +13547,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3410",
-   "self_type" : "type-3409",
+   "referenced_type" : "type-3392",
+   "self_type" : "type-3391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13540,8 +13556,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3415",
-   "self_type" : "type-3414",
+   "referenced_type" : "type-3397",
+   "self_type" : "type-3396",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13597,8 +13613,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-3046",
-   "self_type" : "type-3045",
+   "referenced_type" : "type-3035",
+   "self_type" : "type-3034",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13642,8 +13658,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2492",
-   "self_type" : "type-2491",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2481",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13651,8 +13667,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2503",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13660,8 +13676,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2813",
-   "self_type" : "type-2812",
+   "referenced_type" : "type-2802",
+   "self_type" : "type-2801",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13669,8 +13685,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2818",
-   "self_type" : "type-2817",
+   "referenced_type" : "type-2807",
+   "self_type" : "type-2806",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13678,8 +13694,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3597",
-   "self_type" : "type-3596",
+   "referenced_type" : "type-3579",
+   "self_type" : "type-3578",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13687,8 +13703,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3619",
-   "self_type" : "type-3618",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3600",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13714,8 +13730,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2482",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2471",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13723,8 +13739,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2539",
-   "self_type" : "type-2538",
+   "referenced_type" : "type-2529",
+   "self_type" : "type-2528",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13732,8 +13748,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2808",
-   "self_type" : "type-2807",
+   "referenced_type" : "type-2797",
+   "self_type" : "type-2796",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13741,8 +13757,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2823",
-   "self_type" : "type-2822",
+   "referenced_type" : "type-2812",
+   "self_type" : "type-2811",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13750,8 +13766,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3587",
-   "self_type" : "type-3586",
+   "referenced_type" : "type-3569",
+   "self_type" : "type-3568",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13759,8 +13775,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3644",
-   "self_type" : "type-3643",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3625",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13784,24 +13800,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::CallStack *",
-   "name" : "android::CallStack *",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2222",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::CallStack::StackDeleter *",
-   "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2226",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-979",
@@ -13966,8 +13964,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2658",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2647",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13975,8 +13973,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2854",
-   "self_type" : "type-2853",
+   "referenced_type" : "type-2843",
+   "self_type" : "type-2842",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13993,8 +13991,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2932",
-   "self_type" : "type-2931",
+   "referenced_type" : "type-2921",
+   "self_type" : "type-2920",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -14021,7 +14019,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2232",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14227,8 +14225,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2318",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2307",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14236,8 +14234,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2484",
-   "self_type" : "type-2483",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14245,8 +14243,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2500",
+   "self_type" : "type-2499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14254,8 +14252,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2552",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14263,8 +14261,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2588",
-   "self_type" : "type-2587",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2576",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14272,8 +14270,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2763",
-   "self_type" : "type-2762",
+   "referenced_type" : "type-2752",
+   "self_type" : "type-2751",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14281,8 +14279,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2810",
-   "self_type" : "type-2809",
+   "referenced_type" : "type-2799",
+   "self_type" : "type-2798",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14290,8 +14288,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2815",
-   "self_type" : "type-2814",
+   "referenced_type" : "type-2804",
+   "self_type" : "type-2803",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14299,8 +14297,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2825",
-   "self_type" : "type-2824",
+   "referenced_type" : "type-2814",
+   "self_type" : "type-2813",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14308,8 +14306,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2844",
-   "self_type" : "type-2843",
+   "referenced_type" : "type-2833",
+   "self_type" : "type-2832",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14317,8 +14315,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2910",
-   "self_type" : "type-2909",
+   "referenced_type" : "type-2899",
+   "self_type" : "type-2898",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14326,8 +14324,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2995",
-   "self_type" : "type-2994",
+   "referenced_type" : "type-2984",
+   "self_type" : "type-2983",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14335,8 +14333,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3147",
-   "self_type" : "type-3146",
+   "referenced_type" : "type-3136",
+   "self_type" : "type-3135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14344,8 +14342,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3225",
-   "self_type" : "type-3224",
+   "referenced_type" : "type-3214",
+   "self_type" : "type-3213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14353,8 +14351,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3267",
-   "self_type" : "type-3266",
+   "referenced_type" : "type-3256",
+   "self_type" : "type-3255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14362,8 +14360,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3318",
-   "self_type" : "type-3317",
+   "referenced_type" : "type-3307",
+   "self_type" : "type-3306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14371,8 +14369,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3423",
-   "self_type" : "type-3422",
+   "referenced_type" : "type-3405",
+   "self_type" : "type-3404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14380,8 +14378,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3589",
-   "self_type" : "type-3588",
+   "referenced_type" : "type-3571",
+   "self_type" : "type-3570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14389,8 +14387,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3615",
-   "self_type" : "type-3614",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14470,8 +14468,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2223",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -14524,17 +14522,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2215",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14578,8 +14567,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2279",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14596,8 +14585,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2271",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14911,8 +14900,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2707",
-   "self_type" : "type-2706",
+   "referenced_type" : "type-2696",
+   "self_type" : "type-2695",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14920,8 +14909,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2889",
-   "self_type" : "type-2888",
+   "referenced_type" : "type-2878",
+   "self_type" : "type-2877",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14929,8 +14918,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3095",
-   "self_type" : "type-3094",
+   "referenced_type" : "type-3084",
+   "self_type" : "type-3083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14938,8 +14927,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3133",
-   "self_type" : "type-3132",
+   "referenced_type" : "type-3122",
+   "self_type" : "type-3121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14947,8 +14936,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3215",
-   "self_type" : "type-3214",
+   "referenced_type" : "type-3204",
+   "self_type" : "type-3203",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15019,8 +15008,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2977",
-   "self_type" : "type-2976",
+   "referenced_type" : "type-2966",
+   "self_type" : "type-2965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15028,8 +15017,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-3140",
-   "self_type" : "type-3139",
+   "referenced_type" : "type-3129",
+   "self_type" : "type-3128",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15037,8 +15026,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-3221",
-   "self_type" : "type-3220",
+   "referenced_type" : "type-3210",
+   "self_type" : "type-3209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15109,8 +15098,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2696",
-   "self_type" : "type-2695",
+   "referenced_type" : "type-2685",
+   "self_type" : "type-2684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15118,8 +15107,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2895",
-   "self_type" : "type-2894",
+   "referenced_type" : "type-2884",
+   "self_type" : "type-2883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15127,8 +15116,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3098",
-   "self_type" : "type-3097",
+   "referenced_type" : "type-3087",
+   "self_type" : "type-3086",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15136,8 +15125,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3135",
-   "self_type" : "type-3134",
+   "referenced_type" : "type-3124",
+   "self_type" : "type-3123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15145,8 +15134,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3217",
-   "self_type" : "type-3216",
+   "referenced_type" : "type-3206",
+   "self_type" : "type-3205",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15226,8 +15215,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2567",
-   "self_type" : "type-2566",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2555",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15235,8 +15224,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2839",
-   "self_type" : "type-2838",
+   "referenced_type" : "type-2828",
+   "self_type" : "type-2827",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15244,8 +15233,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3100",
-   "self_type" : "type-3099",
+   "referenced_type" : "type-3089",
+   "self_type" : "type-3088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15253,8 +15242,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3138",
-   "self_type" : "type-3137",
+   "referenced_type" : "type-3127",
+   "self_type" : "type-3126",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15262,8 +15251,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3219",
-   "self_type" : "type-3218",
+   "referenced_type" : "type-3208",
+   "self_type" : "type-3207",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15316,8 +15305,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-2704",
-   "self_type" : "type-2703",
+   "referenced_type" : "type-2693",
+   "self_type" : "type-2692",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15325,8 +15314,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-2886",
-   "self_type" : "type-2885",
+   "referenced_type" : "type-2875",
+   "self_type" : "type-2874",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15370,8 +15359,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2987",
-   "self_type" : "type-2986",
+   "referenced_type" : "type-2976",
+   "self_type" : "type-2975",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15379,8 +15368,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-3143",
-   "self_type" : "type-3142",
+   "referenced_type" : "type-3132",
+   "self_type" : "type-3131",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15388,8 +15377,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-3223",
-   "self_type" : "type-3222",
+   "referenced_type" : "type-3212",
+   "self_type" : "type-3211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15586,8 +15575,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2285",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15595,8 +15584,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2297",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15667,8 +15656,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-3049",
-   "self_type" : "type-3051",
+   "referenced_type" : "type-3038",
+   "self_type" : "type-3040",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15701,15 +15690,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::CallStack *",
-   "name" : "const android::CallStack *",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2224",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace *",
    "name" : "const android::ColorSpace *",
    "referenced_type" : "type-1039",
@@ -15838,8 +15818,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2230",
-   "self_type" : "type-2231",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15892,8 +15872,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15928,22 +15908,13 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2216",
+   "referenced_type" : "type-2215",
    "self_type" : "type-2219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::String8> *",
-   "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2213",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
    "referenced_type" : "type-1425",
@@ -16126,8 +16097,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-2724",
-   "self_type" : "type-2726",
+   "referenced_type" : "type-2713",
+   "self_type" : "type-2715",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16135,8 +16106,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-2890",
-   "self_type" : "type-2893",
+   "referenced_type" : "type-2879",
+   "self_type" : "type-2882",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16162,8 +16133,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-2983",
-   "self_type" : "type-2985",
+   "referenced_type" : "type-2972",
+   "self_type" : "type-2974",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16216,8 +16187,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-2564",
-   "self_type" : "type-2563",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2552",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16225,8 +16196,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-2836",
-   "self_type" : "type-2835",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16252,8 +16223,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-2574",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16261,8 +16232,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-2840",
-   "self_type" : "type-2842",
+   "referenced_type" : "type-2829",
+   "self_type" : "type-2831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16288,8 +16259,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-2898",
-   "self_type" : "type-2897",
+   "referenced_type" : "type-2887",
+   "self_type" : "type-2886",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16495,8 +16466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2301",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2291",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16504,8 +16475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2296",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17070,8 +17041,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17080,8 +17051,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2483",
-   "self_type" : "type-2485",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17090,8 +17061,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2509",
-   "self_type" : "type-2511",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17100,8 +17071,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2552",
-   "self_type" : "type-2554",
+   "referenced_type" : "type-2541",
+   "self_type" : "type-2543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17110,8 +17081,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2587",
-   "self_type" : "type-2589",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2578",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17120,8 +17091,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2762",
-   "self_type" : "type-2764",
+   "referenced_type" : "type-2751",
+   "self_type" : "type-2753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17130,8 +17101,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2809",
-   "self_type" : "type-2811",
+   "referenced_type" : "type-2798",
+   "self_type" : "type-2800",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17140,8 +17111,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2814",
-   "self_type" : "type-2816",
+   "referenced_type" : "type-2803",
+   "self_type" : "type-2805",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17150,8 +17121,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2824",
-   "self_type" : "type-2826",
+   "referenced_type" : "type-2813",
+   "self_type" : "type-2815",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17160,8 +17131,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2843",
-   "self_type" : "type-2845",
+   "referenced_type" : "type-2832",
+   "self_type" : "type-2834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17170,8 +17141,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2909",
-   "self_type" : "type-2911",
+   "referenced_type" : "type-2898",
+   "self_type" : "type-2900",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17180,8 +17151,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2994",
-   "self_type" : "type-2996",
+   "referenced_type" : "type-2983",
+   "self_type" : "type-2985",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17190,8 +17161,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3146",
-   "self_type" : "type-3148",
+   "referenced_type" : "type-3135",
+   "self_type" : "type-3137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17200,8 +17171,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3224",
-   "self_type" : "type-3226",
+   "referenced_type" : "type-3213",
+   "self_type" : "type-3215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17210,8 +17181,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3266",
-   "self_type" : "type-3268",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17220,8 +17191,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3317",
-   "self_type" : "type-3319",
+   "referenced_type" : "type-3306",
+   "self_type" : "type-3308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17230,8 +17201,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3422",
-   "self_type" : "type-3421",
+   "referenced_type" : "type-3404",
+   "self_type" : "type-3403",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17240,8 +17211,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3588",
-   "self_type" : "type-3590",
+   "referenced_type" : "type-3570",
+   "self_type" : "type-3572",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17250,8 +17221,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3614",
-   "self_type" : "type-3616",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3598",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17345,32 +17316,32 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2249",
    "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-2752",
-   "self_type" : "type-2751",
+   "referenced_type" : "type-2741",
+   "self_type" : "type-2740",
    "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-3114",
-   "self_type" : "type-3113",
+   "referenced_type" : "type-3103",
+   "self_type" : "type-3102",
    "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-3387",
-   "self_type" : "type-3386",
+   "referenced_type" : "type-3369",
+   "self_type" : "type-3368",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17385,8 +17356,8 @@
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-3050",
-   "self_type" : "type-3049",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3038",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -17419,32 +17390,32 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2273",
    "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-2743",
-   "self_type" : "type-2742",
+   "referenced_type" : "type-2732",
+   "self_type" : "type-2731",
    "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-3027",
-   "self_type" : "type-3026",
+   "referenced_type" : "type-3016",
+   "self_type" : "type-3015",
    "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-3397",
-   "self_type" : "type-3396",
+   "referenced_type" : "type-3379",
+   "self_type" : "type-3378",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -17466,16 +17437,6 @@
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CallStack",
-   "name" : "const android::CallStack",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2223",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::ColorSpace",
@@ -17630,8 +17591,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3040",
-   "self_type" : "type-3039",
+   "referenced_type" : "type-3029",
+   "self_type" : "type-3028",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17640,8 +17601,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3206",
-   "self_type" : "type-3205",
+   "referenced_type" : "type-3195",
+   "self_type" : "type-3194",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17650,8 +17611,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3210",
-   "self_type" : "type-3209",
+   "referenced_type" : "type-3199",
+   "self_type" : "type-3198",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17751,7 +17712,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2230",
+   "self_type" : "type-2231",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17810,8 +17771,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2220",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -17850,18 +17811,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2216",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::String8>",
-   "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2215",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17910,8 +17861,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2280",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -18150,8 +18101,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-2725",
-   "self_type" : "type-2724",
+   "referenced_type" : "type-2714",
+   "self_type" : "type-2713",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18160,8 +18111,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-2891",
-   "self_type" : "type-2890",
+   "referenced_type" : "type-2880",
+   "self_type" : "type-2879",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18190,8 +18141,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-2984",
-   "self_type" : "type-2983",
+   "referenced_type" : "type-2973",
+   "self_type" : "type-2972",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18390,8 +18341,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-2565",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2554",
+   "self_type" : "type-2553",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18400,8 +18351,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-2837",
-   "self_type" : "type-2836",
+   "referenced_type" : "type-2826",
+   "self_type" : "type-2825",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18430,8 +18381,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-2575",
-   "self_type" : "type-2574",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2563",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18440,8 +18391,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-2841",
-   "self_type" : "type-2840",
+   "referenced_type" : "type-2830",
+   "self_type" : "type-2829",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18470,8 +18421,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-2899",
-   "self_type" : "type-2898",
+   "referenced_type" : "type-2888",
+   "self_type" : "type-2887",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18750,8 +18701,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2286",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -18760,8 +18711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2305",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2295",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -18827,40 +18778,40 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2256",
    "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-2271",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
    "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-2755",
-   "self_type" : "type-2754",
+   "referenced_type" : "type-2744",
+   "self_type" : "type-2743",
    "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-3190",
-   "self_type" : "type-3189",
+   "referenced_type" : "type-3179",
+   "self_type" : "type-3178",
    "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-3390",
-   "self_type" : "type-3389",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -18977,104 +18928,104 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2333",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2322",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2557",
-   "self_type" : "type-2556",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2545",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2592",
-   "self_type" : "type-2591",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2767",
-   "self_type" : "type-2766",
+   "referenced_type" : "type-2756",
+   "self_type" : "type-2755",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2828",
-   "self_type" : "type-2827",
+   "referenced_type" : "type-2817",
+   "self_type" : "type-2816",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2847",
-   "self_type" : "type-2846",
+   "referenced_type" : "type-2836",
+   "self_type" : "type-2835",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2914",
-   "self_type" : "type-2913",
+   "referenced_type" : "type-2903",
+   "self_type" : "type-2902",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3060",
-   "self_type" : "type-3059",
+   "referenced_type" : "type-3049",
+   "self_type" : "type-3048",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3151",
-   "self_type" : "type-3150",
+   "referenced_type" : "type-3140",
+   "self_type" : "type-3139",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3228",
-   "self_type" : "type-3227",
+   "referenced_type" : "type-3217",
+   "self_type" : "type-3216",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3270",
-   "self_type" : "type-3269",
+   "referenced_type" : "type-3259",
+   "self_type" : "type-3258",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3321",
-   "self_type" : "type-3320",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3309",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3438",
-   "self_type" : "type-3437",
+   "referenced_type" : "type-3420",
+   "self_type" : "type-3419",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19218,8 +19169,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-2749",
-   "self_type" : "type-2748",
+   "referenced_type" : "type-2738",
+   "self_type" : "type-2737",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19228,8 +19179,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-3102",
-   "self_type" : "type-3101",
+   "referenced_type" : "type-3091",
+   "self_type" : "type-3090",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19318,8 +19269,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2370",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2360",
    "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"
   },
@@ -19328,8 +19279,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2667",
-   "self_type" : "type-2666",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2655",
    "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"
   },
@@ -19338,8 +19289,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2773",
-   "self_type" : "type-2772",
+   "referenced_type" : "type-2762",
+   "self_type" : "type-2761",
    "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"
   },
@@ -19348,8 +19299,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2860",
-   "self_type" : "type-2859",
+   "referenced_type" : "type-2849",
+   "self_type" : "type-2848",
    "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"
   },
@@ -19358,8 +19309,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2936",
-   "self_type" : "type-2935",
+   "referenced_type" : "type-2925",
+   "self_type" : "type-2924",
    "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"
   },
@@ -19378,8 +19329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3067",
-   "self_type" : "type-3066",
+   "referenced_type" : "type-3056",
+   "self_type" : "type-3055",
    "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"
   },
@@ -19388,8 +19339,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3165",
-   "self_type" : "type-3164",
+   "referenced_type" : "type-3154",
+   "self_type" : "type-3153",
    "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"
   },
@@ -19398,8 +19349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3235",
-   "self_type" : "type-3234",
+   "referenced_type" : "type-3224",
+   "self_type" : "type-3223",
    "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"
   },
@@ -19408,8 +19359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3275",
-   "self_type" : "type-3274",
+   "referenced_type" : "type-3264",
+   "self_type" : "type-3263",
    "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"
   },
@@ -19418,8 +19369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3326",
-   "self_type" : "type-3325",
+   "referenced_type" : "type-3315",
+   "self_type" : "type-3314",
    "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"
   },
@@ -19428,8 +19379,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3475",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3457",
    "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"
   },
@@ -19588,8 +19539,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "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"
   },
@@ -19598,8 +19549,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2661",
    "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"
   },
@@ -19608,8 +19559,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2779",
-   "self_type" : "type-2778",
+   "referenced_type" : "type-2768",
+   "self_type" : "type-2767",
    "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"
   },
@@ -19618,8 +19569,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2866",
-   "self_type" : "type-2865",
+   "referenced_type" : "type-2855",
+   "self_type" : "type-2854",
    "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"
   },
@@ -19628,8 +19579,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2943",
-   "self_type" : "type-2942",
+   "referenced_type" : "type-2932",
+   "self_type" : "type-2931",
    "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"
   },
@@ -19638,8 +19589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3073",
-   "self_type" : "type-3072",
+   "referenced_type" : "type-3062",
+   "self_type" : "type-3061",
    "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"
   },
@@ -19658,8 +19609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3172",
-   "self_type" : "type-3171",
+   "referenced_type" : "type-3161",
+   "self_type" : "type-3160",
    "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"
   },
@@ -19668,8 +19619,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3241",
-   "self_type" : "type-3240",
+   "referenced_type" : "type-3230",
+   "self_type" : "type-3229",
    "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"
   },
@@ -19678,8 +19629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3281",
-   "self_type" : "type-3280",
+   "referenced_type" : "type-3270",
+   "self_type" : "type-3269",
    "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"
   },
@@ -19688,8 +19639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3332",
-   "self_type" : "type-3331",
+   "referenced_type" : "type-3321",
+   "self_type" : "type-3320",
    "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"
   },
@@ -19698,8 +19649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3482",
-   "self_type" : "type-3481",
+   "referenced_type" : "type-3464",
+   "self_type" : "type-3463",
    "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"
   },
@@ -19848,8 +19799,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "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"
   },
@@ -19858,8 +19809,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2675",
-   "self_type" : "type-2674",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2663",
    "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"
   },
@@ -19868,8 +19819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2781",
-   "self_type" : "type-2780",
+   "referenced_type" : "type-2770",
+   "self_type" : "type-2769",
    "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"
   },
@@ -19878,8 +19829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2868",
-   "self_type" : "type-2867",
+   "referenced_type" : "type-2857",
+   "self_type" : "type-2856",
    "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"
   },
@@ -19888,8 +19839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2945",
-   "self_type" : "type-2944",
+   "referenced_type" : "type-2934",
+   "self_type" : "type-2933",
    "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"
   },
@@ -19898,8 +19849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3075",
-   "self_type" : "type-3074",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3063",
    "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"
   },
@@ -19918,8 +19869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3174",
-   "self_type" : "type-3173",
+   "referenced_type" : "type-3163",
+   "self_type" : "type-3162",
    "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"
   },
@@ -19928,8 +19879,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3243",
-   "self_type" : "type-3242",
+   "referenced_type" : "type-3232",
+   "self_type" : "type-3231",
    "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"
   },
@@ -19938,8 +19889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3283",
-   "self_type" : "type-3282",
+   "referenced_type" : "type-3272",
+   "self_type" : "type-3271",
    "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"
   },
@@ -19948,8 +19899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3334",
-   "self_type" : "type-3333",
+   "referenced_type" : "type-3323",
+   "self_type" : "type-3322",
    "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"
   },
@@ -19958,8 +19909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3484",
-   "self_type" : "type-3483",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3465",
    "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"
   },
@@ -20098,8 +20049,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2375",
-   "self_type" : "type-2374",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "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"
   },
@@ -20108,8 +20059,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2671",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2659",
    "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"
   },
@@ -20118,8 +20069,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2777",
-   "self_type" : "type-2776",
+   "referenced_type" : "type-2766",
+   "self_type" : "type-2765",
    "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"
   },
@@ -20128,8 +20079,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2864",
-   "self_type" : "type-2863",
+   "referenced_type" : "type-2853",
+   "self_type" : "type-2852",
    "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"
   },
@@ -20138,8 +20089,18 @@
    "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-2941",
-   "self_type" : "type-2940",
+   "referenced_type" : "type-2930",
+   "self_type" : "type-2929",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
+   "referenced_type" : "type-3060",
+   "self_type" : "type-3059",
    "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"
   },
@@ -20158,8 +20119,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3071",
-   "self_type" : "type-3070",
+   "referenced_type" : "type-3158",
+   "self_type" : "type-3157",
    "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"
   },
@@ -20168,8 +20129,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3169",
-   "self_type" : "type-3168",
+   "referenced_type" : "type-3228",
+   "self_type" : "type-3227",
    "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"
   },
@@ -20178,8 +20139,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3239",
-   "self_type" : "type-3238",
+   "referenced_type" : "type-3268",
+   "self_type" : "type-3267",
    "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"
   },
@@ -20188,8 +20149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3279",
-   "self_type" : "type-3278",
+   "referenced_type" : "type-3319",
+   "self_type" : "type-3318",
    "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"
   },
@@ -20198,18 +20159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3330",
-   "self_type" : "type-3329",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3480",
-   "self_type" : "type-3479",
+   "referenced_type" : "type-3462",
+   "self_type" : "type-3461",
    "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"
   },
@@ -20368,8 +20319,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "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"
   },
@@ -20378,8 +20329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2676",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2665",
    "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"
   },
@@ -20388,8 +20339,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2783",
-   "self_type" : "type-2782",
+   "referenced_type" : "type-2772",
+   "self_type" : "type-2771",
    "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"
   },
@@ -20398,8 +20349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2870",
-   "self_type" : "type-2869",
+   "referenced_type" : "type-2859",
+   "self_type" : "type-2858",
    "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"
   },
@@ -20408,8 +20359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2947",
-   "self_type" : "type-2946",
+   "referenced_type" : "type-2936",
+   "self_type" : "type-2935",
    "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"
   },
@@ -20418,8 +20369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3078",
-   "self_type" : "type-3077",
+   "referenced_type" : "type-3067",
+   "self_type" : "type-3066",
    "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"
   },
@@ -20438,8 +20389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3176",
-   "self_type" : "type-3175",
+   "referenced_type" : "type-3165",
+   "self_type" : "type-3164",
    "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"
   },
@@ -20448,8 +20399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3245",
-   "self_type" : "type-3244",
+   "referenced_type" : "type-3234",
+   "self_type" : "type-3233",
    "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"
   },
@@ -20458,8 +20409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3285",
-   "self_type" : "type-3284",
+   "referenced_type" : "type-3274",
+   "self_type" : "type-3273",
    "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"
   },
@@ -20468,8 +20419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3336",
-   "self_type" : "type-3335",
+   "referenced_type" : "type-3325",
+   "self_type" : "type-3324",
    "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"
   },
@@ -20478,8 +20429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3486",
-   "self_type" : "type-3485",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3467",
    "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"
   },
@@ -20618,8 +20569,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2358",
    "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"
   },
@@ -20628,8 +20579,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2665",
-   "self_type" : "type-2664",
+   "referenced_type" : "type-2654",
+   "self_type" : "type-2653",
    "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"
   },
@@ -20638,8 +20589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2771",
-   "self_type" : "type-2770",
+   "referenced_type" : "type-2760",
+   "self_type" : "type-2759",
    "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"
   },
@@ -20648,8 +20599,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2858",
-   "self_type" : "type-2857",
+   "referenced_type" : "type-2847",
+   "self_type" : "type-2846",
    "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"
   },
@@ -20658,8 +20609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2934",
-   "self_type" : "type-2933",
+   "referenced_type" : "type-2923",
+   "self_type" : "type-2922",
    "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"
   },
@@ -20678,8 +20629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3065",
-   "self_type" : "type-3064",
+   "referenced_type" : "type-3054",
+   "self_type" : "type-3053",
    "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"
   },
@@ -20688,8 +20639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3163",
-   "self_type" : "type-3162",
+   "referenced_type" : "type-3152",
+   "self_type" : "type-3151",
    "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"
   },
@@ -20698,8 +20649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3233",
-   "self_type" : "type-3232",
+   "referenced_type" : "type-3222",
+   "self_type" : "type-3221",
    "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"
   },
@@ -20708,8 +20659,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3273",
-   "self_type" : "type-3272",
+   "referenced_type" : "type-3262",
+   "self_type" : "type-3261",
    "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"
   },
@@ -20718,8 +20669,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3324",
-   "self_type" : "type-3323",
+   "referenced_type" : "type-3313",
+   "self_type" : "type-3312",
    "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"
   },
@@ -20728,8 +20679,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3474",
-   "self_type" : "type-3473",
+   "referenced_type" : "type-3456",
+   "self_type" : "type-3455",
    "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"
   },
@@ -20878,8 +20829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2373",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
    "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"
   },
@@ -20888,8 +20839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2669",
-   "self_type" : "type-2668",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2657",
    "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"
   },
@@ -20898,8 +20849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2775",
-   "self_type" : "type-2774",
+   "referenced_type" : "type-2764",
+   "self_type" : "type-2763",
    "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"
   },
@@ -20908,8 +20859,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2862",
-   "self_type" : "type-2861",
+   "referenced_type" : "type-2851",
+   "self_type" : "type-2850",
    "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"
   },
@@ -20918,8 +20869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2938",
-   "self_type" : "type-2937",
+   "referenced_type" : "type-2927",
+   "self_type" : "type-2926",
    "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"
   },
@@ -20938,8 +20889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3069",
-   "self_type" : "type-3068",
+   "referenced_type" : "type-3058",
+   "self_type" : "type-3057",
    "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"
   },
@@ -20948,8 +20899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3167",
-   "self_type" : "type-3166",
+   "referenced_type" : "type-3156",
+   "self_type" : "type-3155",
    "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"
   },
@@ -20958,8 +20909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3237",
-   "self_type" : "type-3236",
+   "referenced_type" : "type-3226",
+   "self_type" : "type-3225",
    "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"
   },
@@ -20968,8 +20919,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3277",
-   "self_type" : "type-3276",
+   "referenced_type" : "type-3266",
+   "self_type" : "type-3265",
    "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"
   },
@@ -20978,8 +20929,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3328",
-   "self_type" : "type-3327",
+   "referenced_type" : "type-3317",
+   "self_type" : "type-3316",
    "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"
   },
@@ -20988,8 +20939,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3478",
-   "self_type" : "type-3477",
+   "referenced_type" : "type-3460",
+   "self_type" : "type-3459",
    "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"
   },
@@ -21148,8 +21099,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
    "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"
   },
@@ -21158,8 +21109,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2682",
-   "self_type" : "type-2681",
+   "referenced_type" : "type-2671",
+   "self_type" : "type-2670",
    "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"
   },
@@ -21168,8 +21119,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2787",
-   "self_type" : "type-2786",
+   "referenced_type" : "type-2776",
+   "self_type" : "type-2775",
    "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"
   },
@@ -21178,8 +21129,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2874",
-   "self_type" : "type-2873",
+   "referenced_type" : "type-2863",
+   "self_type" : "type-2862",
    "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"
   },
@@ -21188,8 +21139,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2952",
-   "self_type" : "type-2951",
+   "referenced_type" : "type-2941",
+   "self_type" : "type-2940",
    "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"
   },
@@ -21198,8 +21149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3082",
-   "self_type" : "type-3081",
+   "referenced_type" : "type-3071",
+   "self_type" : "type-3070",
    "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"
   },
@@ -21208,8 +21159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3181",
-   "self_type" : "type-3180",
+   "referenced_type" : "type-3170",
+   "self_type" : "type-3169",
    "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"
   },
@@ -21228,8 +21179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3249",
-   "self_type" : "type-3248",
+   "referenced_type" : "type-3238",
+   "self_type" : "type-3237",
    "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"
   },
@@ -21238,8 +21189,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3289",
-   "self_type" : "type-3288",
+   "referenced_type" : "type-3278",
+   "self_type" : "type-3277",
    "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"
   },
@@ -21248,8 +21199,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3340",
-   "self_type" : "type-3339",
+   "referenced_type" : "type-3329",
+   "self_type" : "type-3328",
    "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"
   },
@@ -21258,8 +21209,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3493",
+   "referenced_type" : "type-3476",
+   "self_type" : "type-3475",
    "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"
   },
@@ -21408,8 +21359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
    "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"
   },
@@ -21418,8 +21369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2686",
-   "self_type" : "type-2685",
+   "referenced_type" : "type-2675",
+   "self_type" : "type-2674",
    "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"
   },
@@ -21428,8 +21379,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2791",
-   "self_type" : "type-2790",
+   "referenced_type" : "type-2780",
+   "self_type" : "type-2779",
    "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"
   },
@@ -21438,8 +21389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2878",
-   "self_type" : "type-2877",
+   "referenced_type" : "type-2867",
+   "self_type" : "type-2866",
    "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"
   },
@@ -21448,8 +21399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2956",
-   "self_type" : "type-2955",
+   "referenced_type" : "type-2945",
+   "self_type" : "type-2944",
    "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"
   },
@@ -21458,8 +21409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3088",
-   "self_type" : "type-3087",
+   "referenced_type" : "type-3077",
+   "self_type" : "type-3076",
    "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"
   },
@@ -21468,8 +21419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3186",
-   "self_type" : "type-3185",
+   "referenced_type" : "type-3175",
+   "self_type" : "type-3174",
    "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"
   },
@@ -21488,8 +21439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3253",
-   "self_type" : "type-3252",
+   "referenced_type" : "type-3242",
+   "self_type" : "type-3241",
    "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"
   },
@@ -21498,8 +21449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3293",
-   "self_type" : "type-3292",
+   "referenced_type" : "type-3282",
+   "self_type" : "type-3281",
    "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"
   },
@@ -21508,8 +21459,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3344",
-   "self_type" : "type-3343",
+   "referenced_type" : "type-3333",
+   "self_type" : "type-3332",
    "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"
   },
@@ -21518,8 +21469,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3498",
-   "self_type" : "type-3497",
+   "referenced_type" : "type-3480",
+   "self_type" : "type-3479",
    "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"
   },
@@ -21668,8 +21619,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "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"
   },
@@ -21678,8 +21629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2684",
-   "self_type" : "type-2683",
+   "referenced_type" : "type-2673",
+   "self_type" : "type-2672",
    "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"
   },
@@ -21688,8 +21639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2789",
-   "self_type" : "type-2788",
+   "referenced_type" : "type-2778",
+   "self_type" : "type-2777",
    "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"
   },
@@ -21698,8 +21649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2876",
-   "self_type" : "type-2875",
+   "referenced_type" : "type-2865",
+   "self_type" : "type-2864",
    "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"
   },
@@ -21708,8 +21659,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2954",
-   "self_type" : "type-2953",
+   "referenced_type" : "type-2943",
+   "self_type" : "type-2942",
    "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"
   },
@@ -21718,8 +21669,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3086",
-   "self_type" : "type-3085",
+   "referenced_type" : "type-3075",
+   "self_type" : "type-3074",
    "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"
   },
@@ -21728,8 +21679,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3183",
-   "self_type" : "type-3182",
+   "referenced_type" : "type-3172",
+   "self_type" : "type-3171",
    "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"
   },
@@ -21748,8 +21699,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3251",
-   "self_type" : "type-3250",
+   "referenced_type" : "type-3240",
+   "self_type" : "type-3239",
    "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"
   },
@@ -21758,8 +21709,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3291",
-   "self_type" : "type-3290",
+   "referenced_type" : "type-3280",
+   "self_type" : "type-3279",
    "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"
   },
@@ -21768,8 +21719,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3342",
-   "self_type" : "type-3341",
+   "referenced_type" : "type-3331",
+   "self_type" : "type-3330",
    "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"
   },
@@ -21778,8 +21729,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3496",
-   "self_type" : "type-3495",
+   "referenced_type" : "type-3478",
+   "self_type" : "type-3477",
    "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"
   },
@@ -21928,8 +21879,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2387",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2376",
    "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"
   },
@@ -21938,8 +21889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2679",
-   "self_type" : "type-2678",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
    "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"
   },
@@ -21948,8 +21899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2785",
-   "self_type" : "type-2784",
+   "referenced_type" : "type-2774",
+   "self_type" : "type-2773",
    "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"
   },
@@ -21958,8 +21909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2872",
-   "self_type" : "type-2871",
+   "referenced_type" : "type-2861",
+   "self_type" : "type-2860",
    "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"
   },
@@ -21968,8 +21919,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2950",
-   "self_type" : "type-2949",
+   "referenced_type" : "type-2939",
+   "self_type" : "type-2938",
    "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"
   },
@@ -21978,8 +21929,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3080",
-   "self_type" : "type-3079",
+   "referenced_type" : "type-3069",
+   "self_type" : "type-3068",
    "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"
   },
@@ -21998,8 +21949,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3179",
-   "self_type" : "type-3178",
+   "referenced_type" : "type-3168",
+   "self_type" : "type-3167",
    "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"
   },
@@ -22008,8 +21959,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3247",
-   "self_type" : "type-3246",
+   "referenced_type" : "type-3236",
+   "self_type" : "type-3235",
    "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"
   },
@@ -22018,8 +21969,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3287",
-   "self_type" : "type-3286",
+   "referenced_type" : "type-3276",
+   "self_type" : "type-3275",
    "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"
   },
@@ -22028,8 +21979,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3338",
-   "self_type" : "type-3337",
+   "referenced_type" : "type-3327",
+   "self_type" : "type-3326",
    "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"
   },
@@ -22038,8 +21989,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3492",
-   "self_type" : "type-3491",
+   "referenced_type" : "type-3474",
+   "self_type" : "type-3473",
    "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"
   },
@@ -22188,8 +22139,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2384",
    "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"
   },
@@ -22198,8 +22149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2687",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2676",
    "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"
   },
@@ -22208,8 +22159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2793",
-   "self_type" : "type-2792",
+   "referenced_type" : "type-2782",
+   "self_type" : "type-2781",
    "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"
   },
@@ -22218,8 +22169,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2880",
-   "self_type" : "type-2879",
+   "referenced_type" : "type-2869",
+   "self_type" : "type-2868",
    "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"
   },
@@ -22228,8 +22179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2959",
-   "self_type" : "type-2958",
+   "referenced_type" : "type-2948",
+   "self_type" : "type-2947",
    "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"
   },
@@ -22238,8 +22189,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3090",
-   "self_type" : "type-3089",
+   "referenced_type" : "type-3079",
+   "self_type" : "type-3078",
    "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"
   },
@@ -22248,8 +22199,18 @@
    "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-3188",
-   "self_type" : "type-3187",
+   "referenced_type" : "type-3177",
+   "self_type" : "type-3176",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3244",
+   "self_type" : "type-3243",
    "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"
   },
@@ -22268,8 +22229,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3255",
-   "self_type" : "type-3254",
+   "referenced_type" : "type-3284",
+   "self_type" : "type-3283",
    "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"
   },
@@ -22278,8 +22239,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3295",
-   "self_type" : "type-3294",
+   "referenced_type" : "type-3335",
+   "self_type" : "type-3334",
    "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"
   },
@@ -22288,18 +22249,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3346",
-   "self_type" : "type-3345",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3500",
-   "self_type" : "type-3499",
+   "referenced_type" : "type-3482",
+   "self_type" : "type-3481",
    "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"
   },
@@ -22428,8 +22379,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-2407",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2396",
    "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"
   },
@@ -22438,8 +22389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2801",
-   "self_type" : "type-2800",
+   "referenced_type" : "type-2790",
+   "self_type" : "type-2789",
    "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"
   },
@@ -22448,8 +22399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2968",
-   "self_type" : "type-2967",
+   "referenced_type" : "type-2957",
+   "self_type" : "type-2956",
    "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"
   },
@@ -22458,8 +22409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3198",
-   "self_type" : "type-3197",
+   "referenced_type" : "type-3187",
+   "self_type" : "type-3186",
    "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"
   },
@@ -22468,8 +22419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3263",
-   "self_type" : "type-3262",
+   "referenced_type" : "type-3252",
+   "self_type" : "type-3251",
    "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"
   },
@@ -22478,8 +22429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3303",
-   "self_type" : "type-3302",
+   "referenced_type" : "type-3292",
+   "self_type" : "type-3291",
    "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"
   },
@@ -22488,8 +22439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3354",
-   "self_type" : "type-3353",
+   "referenced_type" : "type-3343",
+   "self_type" : "type-3342",
    "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"
   },
@@ -22498,8 +22449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3512",
-   "self_type" : "type-3511",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3493",
    "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"
   },
@@ -22618,8 +22569,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-2405",
-   "self_type" : "type-2404",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2394",
    "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"
   },
@@ -22628,8 +22579,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2799",
-   "self_type" : "type-2798",
+   "referenced_type" : "type-2788",
+   "self_type" : "type-2787",
    "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"
   },
@@ -22638,8 +22589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2966",
-   "self_type" : "type-2965",
+   "referenced_type" : "type-2955",
+   "self_type" : "type-2954",
    "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"
   },
@@ -22648,8 +22599,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3196",
-   "self_type" : "type-3195",
+   "referenced_type" : "type-3185",
+   "self_type" : "type-3184",
    "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"
   },
@@ -22658,8 +22609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3261",
-   "self_type" : "type-3260",
+   "referenced_type" : "type-3250",
+   "self_type" : "type-3249",
    "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"
   },
@@ -22668,8 +22619,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3301",
-   "self_type" : "type-3300",
+   "referenced_type" : "type-3290",
+   "self_type" : "type-3289",
    "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"
   },
@@ -22678,8 +22629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3352",
-   "self_type" : "type-3351",
+   "referenced_type" : "type-3341",
+   "self_type" : "type-3340",
    "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"
   },
@@ -22688,8 +22639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3510",
-   "self_type" : "type-3509",
+   "referenced_type" : "type-3492",
+   "self_type" : "type-3491",
    "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"
   },
@@ -22808,8 +22759,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-2403",
-   "self_type" : "type-2402",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2392",
    "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"
   },
@@ -22818,8 +22769,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2797",
-   "self_type" : "type-2796",
+   "referenced_type" : "type-2786",
+   "self_type" : "type-2785",
    "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"
   },
@@ -22828,8 +22779,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2963",
-   "self_type" : "type-2962",
+   "referenced_type" : "type-2952",
+   "self_type" : "type-2951",
    "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"
   },
@@ -22838,8 +22789,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3194",
-   "self_type" : "type-3193",
+   "referenced_type" : "type-3183",
+   "self_type" : "type-3182",
    "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"
   },
@@ -22848,8 +22799,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3259",
-   "self_type" : "type-3258",
+   "referenced_type" : "type-3248",
+   "self_type" : "type-3247",
    "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"
   },
@@ -22858,8 +22809,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3299",
-   "self_type" : "type-3298",
+   "referenced_type" : "type-3288",
+   "self_type" : "type-3287",
    "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"
   },
@@ -22868,8 +22819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3350",
-   "self_type" : "type-3349",
+   "referenced_type" : "type-3339",
+   "self_type" : "type-3338",
    "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"
   },
@@ -22878,8 +22829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3508",
-   "self_type" : "type-3507",
+   "referenced_type" : "type-3490",
+   "self_type" : "type-3489",
    "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"
   },
@@ -22998,8 +22949,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-2401",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
    "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"
   },
@@ -23008,8 +22959,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2795",
-   "self_type" : "type-2794",
+   "referenced_type" : "type-2784",
+   "self_type" : "type-2783",
    "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"
   },
@@ -23018,8 +22969,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2961",
-   "self_type" : "type-2960",
+   "referenced_type" : "type-2950",
+   "self_type" : "type-2949",
    "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"
   },
@@ -23028,8 +22979,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3192",
-   "self_type" : "type-3191",
+   "referenced_type" : "type-3181",
+   "self_type" : "type-3180",
    "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"
   },
@@ -23038,8 +22989,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3257",
-   "self_type" : "type-3256",
+   "referenced_type" : "type-3246",
+   "self_type" : "type-3245",
    "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"
   },
@@ -23048,8 +22999,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3297",
-   "self_type" : "type-3296",
+   "referenced_type" : "type-3286",
+   "self_type" : "type-3285",
    "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"
   },
@@ -23058,8 +23009,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3348",
-   "self_type" : "type-3347",
+   "referenced_type" : "type-3337",
+   "self_type" : "type-3336",
    "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"
   },
@@ -23068,8 +23019,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3506",
-   "self_type" : "type-3505",
+   "referenced_type" : "type-3488",
+   "self_type" : "type-3487",
    "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"
   },
@@ -23188,8 +23139,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-2409",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2398",
    "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"
   },
@@ -23198,8 +23149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2803",
-   "self_type" : "type-2802",
+   "referenced_type" : "type-2792",
+   "self_type" : "type-2791",
    "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"
   },
@@ -23208,8 +23159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2970",
-   "self_type" : "type-2969",
+   "referenced_type" : "type-2959",
+   "self_type" : "type-2958",
    "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"
   },
@@ -23218,8 +23169,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3200",
-   "self_type" : "type-3199",
+   "referenced_type" : "type-3189",
+   "self_type" : "type-3188",
    "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"
   },
@@ -23228,8 +23179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3265",
-   "self_type" : "type-3264",
+   "referenced_type" : "type-3254",
+   "self_type" : "type-3253",
    "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"
   },
@@ -23238,8 +23189,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3305",
-   "self_type" : "type-3304",
+   "referenced_type" : "type-3294",
+   "self_type" : "type-3293",
    "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"
   },
@@ -23248,8 +23199,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3356",
-   "self_type" : "type-3355",
+   "referenced_type" : "type-3345",
+   "self_type" : "type-3344",
    "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"
   },
@@ -23258,8 +23209,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3513",
+   "referenced_type" : "type-3496",
+   "self_type" : "type-3495",
    "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"
   },
@@ -23368,8 +23319,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2613",
-   "self_type" : "type-2612",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2601",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23378,8 +23329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2850",
-   "self_type" : "type-2849",
+   "referenced_type" : "type-2839",
+   "self_type" : "type-2838",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23388,8 +23339,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2923",
-   "self_type" : "type-2922",
+   "referenced_type" : "type-2912",
+   "self_type" : "type-2911",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23398,8 +23349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3063",
-   "self_type" : "type-3062",
+   "referenced_type" : "type-3052",
+   "self_type" : "type-3051",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23408,8 +23359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3159",
-   "self_type" : "type-3158",
+   "referenced_type" : "type-3148",
+   "self_type" : "type-3147",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23418,8 +23369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3231",
-   "self_type" : "type-3230",
+   "referenced_type" : "type-3220",
+   "self_type" : "type-3219",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23488,8 +23439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2746",
-   "self_type" : "type-2745",
+   "referenced_type" : "type-2735",
+   "self_type" : "type-2734",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23498,8 +23449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-3084",
-   "self_type" : "type-3083",
+   "referenced_type" : "type-3073",
+   "self_type" : "type-3072",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23518,8 +23469,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2245",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23528,8 +23479,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2738",
-   "self_type" : "type-2737",
+   "referenced_type" : "type-2727",
+   "self_type" : "type-2726",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23538,8 +23489,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2856",
-   "self_type" : "type-2855",
+   "referenced_type" : "type-2845",
+   "self_type" : "type-2844",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23548,8 +23499,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-3383",
-   "self_type" : "type-3382",
+   "referenced_type" : "type-3365",
+   "self_type" : "type-3364",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23578,8 +23529,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2247",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23588,8 +23539,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2741",
-   "self_type" : "type-2740",
+   "referenced_type" : "type-2730",
+   "self_type" : "type-2729",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23598,8 +23549,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2926",
-   "self_type" : "type-2925",
+   "referenced_type" : "type-2915",
+   "self_type" : "type-2914",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23608,8 +23559,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-3385",
-   "self_type" : "type-3384",
+   "referenced_type" : "type-3367",
+   "self_type" : "type-3366",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23638,8 +23589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2266",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23648,8 +23599,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2758",
-   "self_type" : "type-2757",
+   "referenced_type" : "type-2747",
+   "self_type" : "type-2746",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23658,8 +23609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-3203",
-   "self_type" : "type-3202",
+   "referenced_type" : "type-3192",
+   "self_type" : "type-3191",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23678,8 +23629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2524",
-   "self_type" : "type-2523",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23688,8 +23639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2820",
-   "self_type" : "type-2819",
+   "referenced_type" : "type-2809",
+   "self_type" : "type-2808",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23698,8 +23649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-3629",
-   "self_type" : "type-3628",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3610",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23718,8 +23669,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-3311",
-   "self_type" : "type-3310",
+   "referenced_type" : "type-3300",
+   "self_type" : "type-3299",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -23838,8 +23789,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2416",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23848,8 +23799,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2562",
-   "self_type" : "type-2561",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2550",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23858,8 +23809,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2693",
-   "self_type" : "type-2692",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2681",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23868,8 +23819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2806",
-   "self_type" : "type-2805",
+   "referenced_type" : "type-2795",
+   "self_type" : "type-2794",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23878,8 +23829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2832",
-   "self_type" : "type-2831",
+   "referenced_type" : "type-2821",
+   "self_type" : "type-2820",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23888,8 +23839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2883",
-   "self_type" : "type-2882",
+   "referenced_type" : "type-2872",
+   "self_type" : "type-2871",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23898,8 +23849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2974",
-   "self_type" : "type-2973",
+   "referenced_type" : "type-2963",
+   "self_type" : "type-2962",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23908,8 +23859,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3055",
-   "self_type" : "type-3054",
+   "referenced_type" : "type-3044",
+   "self_type" : "type-3043",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23918,8 +23869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3130",
-   "self_type" : "type-3129",
+   "referenced_type" : "type-3119",
+   "self_type" : "type-3118",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23928,8 +23879,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3213",
-   "self_type" : "type-3212",
+   "referenced_type" : "type-3202",
+   "self_type" : "type-3201",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3297",
+   "self_type" : "type-3296",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23948,8 +23909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3308",
-   "self_type" : "type-3307",
+   "referenced_type" : "type-3348",
+   "self_type" : "type-3347",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23958,18 +23919,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3359",
-   "self_type" : "type-3358",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3532",
-   "self_type" : "type-3531",
+   "referenced_type" : "type-3514",
+   "self_type" : "type-3513",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -24403,35 +24354,6 @@
    ]
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFrameLines",
-     "referenced_type" : "type-2210"
-    }
-   ],
-   "linker_set_key" : "android::CallStack",
-   "name" : "android::CallStack",
-   "record_kind" : "class",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStackE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CallStack::StackDeleter",
-   "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2225",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
@@ -25370,11 +25292,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2228",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2222",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2229" ],
+   "template_args" : [ "type-2221" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -25751,7 +25673,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2228"
+     "referenced_type" : "type-2222"
     }
    ],
    "fields" :
@@ -25759,14 +25681,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2214"
+     "referenced_type" : "type-2213"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2229",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2221",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -26197,8 +26119,8 @@
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2213",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -26359,61 +26281,6 @@
      "referenced_type" : "type-235"
     }
    ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2210",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-285" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-235"
-    }
-   ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
@@ -26778,28 +26645,28 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "type-2254"
+    },
+    {
+     "referenced_type" : "type-2255"
+    },
+    {
+     "referenced_type" : "type-2252"
+    },
+    {
      "referenced_type" : "type-2265"
     },
     {
-     "referenced_type" : "type-2266"
+     "referenced_type" : "type-2268"
     },
     {
-     "referenced_type" : "type-2264"
+     "referenced_type" : "type-2270"
     },
     {
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2269"
     },
     {
-     "referenced_type" : "type-2278"
-    },
-    {
-     "referenced_type" : "type-2280"
-    },
-    {
-     "referenced_type" : "type-2279"
-    },
-    {
-     "referenced_type" : "type-2282"
+     "referenced_type" : "type-2272"
     }
    ],
    "fields" :
@@ -26807,14 +26674,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2277"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2287",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -26837,8 +26704,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-2282",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26861,8 +26728,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-2279",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26885,8 +26752,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-2277",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2265",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26909,8 +26776,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-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2268",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26933,8 +26800,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-2280",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28319,8 +28186,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-2264",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2252",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28451,8 +28318,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-2266",
-   "self_type" : "type-2266",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28835,8 +28702,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-2265",
-   "self_type" : "type-2265",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -31669,8 +31536,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2234",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -32582,8 +32449,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -32651,7 +32518,7 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2295"
+     "referenced_type" : "type-2284"
     },
     {
      "access" : "private",
@@ -32663,8 +32530,8 @@
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -32681,8 +32548,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -32692,13 +32559,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2246"
+     "referenced_type" : "type-2209"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
diff --git a/Q/64/arm_armv8-a/source-based/libstagefright_bufferpool@2.0.so.lsdump b/Q/64/arm_armv8-a/source-based/libstagefright_bufferpool@2.0.so.lsdump
index f650c65..98205a7 100644
--- a/Q/64/arm_armv8-a/source-based/libstagefright_bufferpool@2.0.so.lsdump
+++ b/Q/64/arm_armv8-a/source-based/libstagefright_bufferpool@2.0.so.lsdump
@@ -197,10 +197,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2EjP13native_handlejb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEaSERKS7_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2EjP13native_handlejb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEaSERKS7_"
   },
   {
@@ -213,10 +229,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE17unmapGrantorDescrEPvj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE4readEPS5_j"
   },
   {
@@ -245,10 +257,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE17unmapGrantorDescrEPvj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE4readEPS5_j"
   },
   {
@@ -1733,6 +1741,54 @@
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-347"
+    },
+    {
+     "referenced_type" : "type-359"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2EjP13native_handlejb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-347"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-87"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
    "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::operator=",
    "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEaSERKS7_",
    "parameters" :
@@ -1749,6 +1805,54 @@
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
   },
   {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-368"
+    },
+    {
+     "referenced_type" : "type-359"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2EjP13native_handlejb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-368"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-87"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
    "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::operator=",
    "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEaSERKS7_",
    "parameters" :
@@ -1799,26 +1903,6 @@
    "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::unmapGrantorDescr",
-   "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE17unmapGrantorDescrEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-619"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-13"
-    }
-   ],
-   "return_type" : "type-70",
-   "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
-  },
-  {
    "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::read",
    "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE4readEPS5_j",
    "parameters" :
@@ -1944,26 +2028,6 @@
    "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::unmapGrantorDescr",
-   "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE17unmapGrantorDescrEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-620"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-13"
-    }
-   ],
-   "return_type" : "type-70",
-   "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
-  },
-  {
    "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::read",
    "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE4readEPS5_j",
    "parameters" :
@@ -8000,8 +8064,8 @@
     }
    ],
    "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-10",
    "self_type" : "type-10",
@@ -8060,8 +8124,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-254",
    "self_type" : "type-254",
@@ -8102,8 +8166,8 @@
     }
    ],
    "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-242",
    "self_type" : "type-242",
@@ -8144,8 +8208,8 @@
     }
    ],
    "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-338",
    "self_type" : "type-338",
diff --git a/Q/64/arm_armv8-a/source-based/libui.so.lsdump b/Q/64/arm_armv8-a/source-based/libui.so.lsdump
index 353496c..e0db418 100644
--- a/Q/64/arm_armv8-a/source-based/libui.so.lsdump
+++ b/Q/64/arm_armv8-a/source-based/libui.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer_Plane [4]",
    "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-509",
+   "self_type" : "type-508",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
   },
@@ -15,7 +15,7 @@
    "linker_set_key" : "android::details::TVec3<float> [3]",
    "name" : "android::details::TVec3<float> [3]",
    "referenced_type" : "type-17",
-   "self_type" : "type-719",
+   "self_type" : "type-904",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
@@ -24,7 +24,7 @@
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
    "referenced_type" : "type-200",
-   "self_type" : "type-1280",
+   "self_type" : "type-2277",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -33,14 +33,14 @@
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
    "referenced_type" : "type-288",
-   "self_type" : "type-1489",
+   "self_type" : "type-1261",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "linker_set_key" : "float []",
    "name" : "float []",
    "referenced_type" : "type-10",
-   "self_type" : "type-1463",
+   "self_type" : "type-1231",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
@@ -56,7 +56,7 @@
    "linker_set_key" : "int [7]",
    "name" : "int [7]",
    "referenced_type" : "type-103",
-   "self_type" : "type-801",
+   "self_type" : "type-564",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -65,7 +65,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-218",
-   "self_type" : "type-1498",
+   "self_type" : "type-1270",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -74,7 +74,7 @@
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
    "referenced_type" : "type-123",
-   "self_type" : "type-1341",
+   "self_type" : "type-1109",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -83,7 +83,7 @@
    "linker_set_key" : "unsigned int [12]",
    "name" : "unsigned int [12]",
    "referenced_type" : "type-123",
-   "self_type" : "type-797",
+   "self_type" : "type-559",
    "size" : 48,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -92,7 +92,7 @@
    "linker_set_key" : "unsigned int [25]",
    "name" : "unsigned int [25]",
    "referenced_type" : "type-123",
-   "self_type" : "type-796",
+   "self_type" : "type-558",
    "size" : 100,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -101,7 +101,7 @@
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
    "referenced_type" : "type-123",
-   "self_type" : "type-778",
+   "self_type" : "type-941",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -119,7 +119,7 @@
    "linker_set_key" : "void *[1]",
    "name" : "void *[1]",
    "referenced_type" : "type-227",
-   "self_type" : "type-762",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -128,7 +128,7 @@
    "linker_set_key" : "void *[3]",
    "name" : "void *[3]",
    "referenced_type" : "type-227",
-   "self_type" : "type-833",
+   "self_type" : "type-596",
    "size" : 12,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -137,7 +137,7 @@
    "linker_set_key" : "void *[4]",
    "name" : "void *[4]",
    "referenced_type" : "type-227",
-   "self_type" : "type-758",
+   "self_type" : "type-519",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -146,7 +146,7 @@
    "linker_set_key" : "void *[6]",
    "name" : "void *[6]",
    "referenced_type" : "type-227",
-   "self_type" : "type-763",
+   "self_type" : "type-524",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -155,7 +155,7 @@
    "linker_set_key" : "void *[7]",
    "name" : "void *[7]",
    "referenced_type" : "type-227",
-   "self_type" : "type-845",
+   "self_type" : "type-609",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   }
@@ -222,8 +222,8 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
+   "referenced_type" : "type-687",
+   "self_type" : "type-687",
    "size" : 4
   },
   {
@@ -248,8 +248,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
+   "referenced_type" : "type-599",
+   "self_type" : "type-599",
    "size" : 2
   },
   {
@@ -257,8 +257,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 1
   },
   {
@@ -287,8 +287,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
+   "referenced_type" : "type-710",
+   "self_type" : "type-710",
    "size" : 4
   },
   {
@@ -1179,6 +1179,9 @@
    "name" : "_ZNK7android17Gralloc3Allocator8isLoadedEv"
   },
   {
+   "name" : "_ZNK7android22GraphicBufferAllocator12getTotalSizeEv"
+  },
+  {
    "name" : "_ZNK7android22GraphicBufferAllocator4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
   },
   {
@@ -1839,8 +1842,8 @@
    ],
    "linker_set_key" : "AHardwareBuffer_Format",
    "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-852",
-   "self_type" : "type-852",
+   "referenced_type" : "type-616",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "underlying_type" : "type-123",
@@ -2005,8 +2008,8 @@
    ],
    "linker_set_key" : "AHardwareBuffer_UsageFlags",
    "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-914",
-   "self_type" : "type-914",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "underlying_type" : "type-124",
@@ -2053,8 +2056,8 @@
    ],
    "linker_set_key" : "android::Fence::Status",
    "name" : "android::Fence::Status",
-   "referenced_type" : "type-1574",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1346",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
    "underlying_type" : "type-103",
@@ -2079,8 +2082,8 @@
    ],
    "linker_set_key" : "android::FenceTime::Snapshot::State",
    "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1612",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1384",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "underlying_type" : "type-103",
@@ -2106,8 +2109,8 @@
    ],
    "linker_set_key" : "android::FenceTime::State",
    "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "underlying_type" : "type-103",
@@ -2136,8 +2139,8 @@
    ],
    "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
    "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-865",
-   "self_type" : "type-865",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "underlying_type" : "type-218",
@@ -2158,8 +2161,8 @@
    ],
    "linker_set_key" : "android::GraphicBufferMapper::Version",
    "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-768",
-   "self_type" : "type-768",
+   "referenced_type" : "type-529",
+   "self_type" : "type-529",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
    "underlying_type" : "type-123",
@@ -2194,8 +2197,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-674",
-   "self_type" : "type-674",
+   "referenced_type" : "type-864",
+   "self_type" : "type-864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-123",
@@ -2212,8 +2215,8 @@
    ],
    "linker_set_key" : "android::details::TMat33<float>::no_init",
    "name" : "android::details::TMat33<float>::no_init",
-   "referenced_type" : "type-853",
-   "self_type" : "type-853",
+   "referenced_type" : "type-975",
+   "self_type" : "type-975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h",
    "underlying_type" : "type-123",
@@ -2230,8 +2233,8 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "underlying_type" : "type-123",
@@ -2266,8 +2269,8 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<float>::no_init",
    "name" : "android::details::TQuaternion<float>::no_init",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-428",
+   "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "underlying_type" : "type-123",
@@ -2284,8 +2287,8 @@
    ],
    "linker_set_key" : "android::details::TVec2<bool>::no_init",
    "name" : "android::details::TVec2<bool>::no_init",
-   "referenced_type" : "type-1483",
-   "self_type" : "type-1483",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "underlying_type" : "type-123",
@@ -2302,8 +2305,8 @@
    ],
    "linker_set_key" : "android::details::TVec2<double>::no_init",
    "name" : "android::details::TVec2<double>::no_init",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1253",
+   "referenced_type" : "type-1068",
+   "self_type" : "type-1068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "underlying_type" : "type-123",
@@ -2320,8 +2323,8 @@
    ],
    "linker_set_key" : "android::details::TVec2<float>::no_init",
    "name" : "android::details::TVec2<float>::no_init",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "underlying_type" : "type-123",
@@ -2338,8 +2341,8 @@
    ],
    "linker_set_key" : "android::details::TVec3<double>::no_init",
    "name" : "android::details::TVec3<double>::no_init",
-   "referenced_type" : "type-1593",
-   "self_type" : "type-1593",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1365",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "underlying_type" : "type-123",
@@ -2356,8 +2359,8 @@
    ],
    "linker_set_key" : "android::details::TVec3<float>::no_init",
    "name" : "android::details::TVec3<float>::no_init",
-   "referenced_type" : "type-1640",
-   "self_type" : "type-1640",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "underlying_type" : "type-123",
@@ -2411,8 +2414,8 @@
    ],
    "linker_set_key" : "android::half::Binary",
    "name" : "android::half::Binary",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-403",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "underlying_type" : "type-123",
@@ -2437,8 +2440,8 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-1549",
-   "self_type" : "type-1549",
+   "referenced_type" : "type-1321",
+   "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "underlying_type" : "type-103",
@@ -2459,8 +2462,8 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-1361",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1129",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "underlying_type" : "type-123",
@@ -2539,8 +2542,8 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-1536",
-   "self_type" : "type-1536",
+   "referenced_type" : "type-1308",
+   "self_type" : "type-1308",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "underlying_type" : "type-103",
@@ -2593,8 +2596,8 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1455",
+   "referenced_type" : "type-1223",
+   "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "underlying_type" : "type-123",
@@ -2753,8 +2756,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::ColorMode",
    "name" : "android::hardware::graphics::common::V1_0::ColorMode",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1140",
+   "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",
@@ -2795,8 +2798,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::ColorTransform",
    "name" : "android::hardware::graphics::common::V1_0::ColorTransform",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1373",
+   "referenced_type" : "type-1141",
+   "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",
@@ -3037,8 +3040,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Dataspace",
    "name" : "android::hardware::graphics::common::V1_0::Dataspace",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1139",
+   "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",
@@ -3063,8 +3066,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Hdr",
    "name" : "android::hardware::graphics::common::V1_0::Hdr",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1375",
+   "referenced_type" : "type-1143",
+   "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",
@@ -3157,8 +3160,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_0::PixelFormat",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1137",
+   "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",
@@ -3191,8 +3194,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Transform",
    "name" : "android::hardware::graphics::common::V1_0::Transform",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-1138",
+   "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",
@@ -3371,8 +3374,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::ColorMode",
    "name" : "android::hardware::graphics::common::V1_1::ColorMode",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1170",
+   "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",
@@ -3629,8 +3632,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::Dataspace",
    "name" : "android::hardware::graphics::common::V1_1::Dataspace",
-   "referenced_type" : "type-1401",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1169",
+   "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",
@@ -3751,8 +3754,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_1::PixelFormat",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1168",
+   "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",
@@ -3781,8 +3784,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::RenderIntent",
    "name" : "android::hardware::graphics::common::V1_1::RenderIntent",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1171",
+   "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",
@@ -3899,8 +3902,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
+   "referenced_type" : "type-420",
+   "self_type" : "type-420",
    "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",
@@ -3969,8 +3972,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::ColorMode",
    "name" : "android::hardware::graphics::common::V1_2::ColorMode",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1192",
+   "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",
@@ -4243,8 +4246,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::Dataspace",
    "name" : "android::hardware::graphics::common::V1_2::Dataspace",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1191",
+   "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",
@@ -4273,8 +4276,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::Hdr",
    "name" : "android::hardware::graphics::common::V1_2::Hdr",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1190",
+   "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",
@@ -4399,8 +4402,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_2::PixelFormat",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1194",
+   "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",
@@ -4467,8 +4470,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-1291",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2289",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "underlying_type" : "type-123",
@@ -4501,8 +4504,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-1292",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2290",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "underlying_type" : "type-123",
@@ -4551,8 +4554,8 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1485",
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-123",
@@ -4605,8 +4608,8 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1444",
+   "referenced_type" : "type-1212",
+   "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-123",
@@ -4631,8 +4634,8 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-1217",
+   "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-123",
@@ -4673,8 +4676,8 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-1445",
-   "self_type" : "type-1445",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-123",
@@ -4915,8 +4918,8 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-1211",
+   "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-123",
@@ -4945,8 +4948,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1448",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-123",
@@ -4975,8 +4978,8 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-123",
@@ -5017,8 +5020,8 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1457",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-123",
@@ -5055,8 +5058,8 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1459",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "underlying_type" : "type-123",
@@ -5081,8 +5084,8 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1446",
+   "referenced_type" : "type-1214",
+   "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-123",
@@ -5099,8 +5102,8 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-123",
@@ -5129,8 +5132,8 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1456",
-   "self_type" : "type-1456",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
    "underlying_type" : "type-123",
@@ -5223,8 +5226,8 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1441",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-123",
@@ -5265,8 +5268,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1447",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-123",
@@ -5283,8 +5286,8 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-1222",
+   "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
    "underlying_type" : "type-123",
@@ -5313,8 +5316,8 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1451",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
    "underlying_type" : "type-123",
@@ -5347,8 +5350,8 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-1210",
+   "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
    "underlying_type" : "type-123",
@@ -5401,8 +5404,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1486",
+   "referenced_type" : "type-1258",
+   "self_type" : "type-1258",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-123",
@@ -5439,15 +5442,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-840"
+     "referenced_type" : "type-604"
     },
     {
      "referenced_type" : "type-142"
     }
    ],
-   "referenced_type" : "type-842",
+   "referenced_type" : "type-606",
    "return_type" : "type-103",
-   "self_type" : "type-842",
+   "self_type" : "type-606",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5457,7 +5460,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-840"
+     "referenced_type" : "type-604"
     },
     {
      "referenced_type" : "type-103"
@@ -5475,12 +5478,12 @@
      "referenced_type" : "type-346"
     },
     {
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     }
    ],
-   "referenced_type" : "type-839",
+   "referenced_type" : "type-603",
    "return_type" : "type-103",
-   "self_type" : "type-839",
+   "self_type" : "type-603",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5490,15 +5493,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-818"
+     "referenced_type" : "type-581"
     },
     {
      "referenced_type" : "type-142"
     }
    ],
-   "referenced_type" : "type-817",
+   "referenced_type" : "type-580",
    "return_type" : "type-103",
-   "self_type" : "type-817",
+   "self_type" : "type-580",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5508,18 +5511,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-818"
+     "referenced_type" : "type-581"
     },
     {
      "referenced_type" : "type-142"
     },
     {
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     }
    ],
-   "referenced_type" : "type-829",
+   "referenced_type" : "type-592",
    "return_type" : "type-103",
-   "self_type" : "type-829",
+   "self_type" : "type-592",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5529,7 +5532,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-818"
+     "referenced_type" : "type-581"
     },
     {
      "referenced_type" : "type-142"
@@ -5553,9 +5556,9 @@
      "referenced_type" : "type-347"
     }
    ],
-   "referenced_type" : "type-825",
+   "referenced_type" : "type-588",
    "return_type" : "type-103",
-   "self_type" : "type-825",
+   "self_type" : "type-588",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5565,7 +5568,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-818"
+     "referenced_type" : "type-581"
     },
     {
      "referenced_type" : "type-142"
@@ -5592,9 +5595,9 @@
      "referenced_type" : "type-103"
     }
    ],
-   "referenced_type" : "type-832",
+   "referenced_type" : "type-595",
    "return_type" : "type-103",
-   "self_type" : "type-832",
+   "self_type" : "type-595",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5604,7 +5607,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-818"
+     "referenced_type" : "type-581"
     },
     {
      "referenced_type" : "type-142"
@@ -5628,9 +5631,9 @@
      "referenced_type" : "type-251"
     }
    ],
-   "referenced_type" : "type-821",
+   "referenced_type" : "type-584",
    "return_type" : "type-103",
-   "self_type" : "type-821",
+   "self_type" : "type-584",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5640,7 +5643,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-818"
+     "referenced_type" : "type-581"
     },
     {
      "referenced_type" : "type-142"
@@ -5667,9 +5670,9 @@
      "referenced_type" : "type-103"
     }
    ],
-   "referenced_type" : "type-827",
+   "referenced_type" : "type-590",
    "return_type" : "type-103",
-   "self_type" : "type-827",
+   "self_type" : "type-590",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5679,15 +5682,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-818"
+     "referenced_type" : "type-581"
     },
     {
      "referenced_type" : "type-103"
     }
    ],
-   "referenced_type" : "type-823",
+   "referenced_type" : "type-586",
    "return_type" : "type-103",
-   "self_type" : "type-823",
+   "self_type" : "type-586",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5697,18 +5700,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-792"
+     "referenced_type" : "type-554"
     },
     {
      "referenced_type" : "type-286"
     },
     {
-     "referenced_type" : "type-794"
+     "referenced_type" : "type-556"
     }
    ],
-   "referenced_type" : "type-791",
+   "referenced_type" : "type-553",
    "return_type" : "type-103",
-   "self_type" : "type-791",
+   "self_type" : "type-553",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5718,12 +5721,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-804"
+     "referenced_type" : "type-567"
     }
    ],
-   "referenced_type" : "type-810",
+   "referenced_type" : "type-573",
    "return_type" : "type-103",
-   "self_type" : "type-810",
+   "self_type" : "type-573",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5733,15 +5736,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-804"
+     "referenced_type" : "type-567"
     },
     {
      "referenced_type" : "type-142"
     }
    ],
-   "referenced_type" : "type-808",
+   "referenced_type" : "type-571",
    "return_type" : "type-103",
-   "self_type" : "type-808",
+   "self_type" : "type-571",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5751,15 +5754,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-804"
+     "referenced_type" : "type-567"
     },
     {
      "referenced_type" : "type-103"
     }
    ],
-   "referenced_type" : "type-803",
+   "referenced_type" : "type-566",
    "return_type" : "type-103",
-   "self_type" : "type-803",
+   "self_type" : "type-566",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5769,7 +5772,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-804"
+     "referenced_type" : "type-567"
     },
     {
      "referenced_type" : "type-103"
@@ -5784,9 +5787,9 @@
      "referenced_type" : "type-103"
     }
    ],
-   "referenced_type" : "type-806",
+   "referenced_type" : "type-569",
    "return_type" : "type-103",
-   "self_type" : "type-806",
+   "self_type" : "type-569",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5796,12 +5799,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-795"
+     "referenced_type" : "type-557"
     }
    ],
-   "referenced_type" : "type-799",
+   "referenced_type" : "type-561",
    "return_type" : "type-103",
-   "self_type" : "type-799",
+   "self_type" : "type-561",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5826,18 +5829,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-840"
+     "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-813"
+     "referenced_type" : "type-576"
     },
     {
      "referenced_type" : "type-103"
     }
    ],
-   "referenced_type" : "type-844",
+   "referenced_type" : "type-608",
    "return_type" : "type-151",
-   "self_type" : "type-844",
+   "self_type" : "type-608",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5877,12 +5880,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-761"
+     "referenced_type" : "type-522"
     }
    ],
-   "referenced_type" : "type-760",
+   "referenced_type" : "type-521",
    "return_type" : "type-151",
-   "self_type" : "type-760",
+   "self_type" : "type-521",
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
@@ -5892,18 +5895,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-804"
+     "referenced_type" : "type-567"
     },
     {
-     "referenced_type" : "type-813"
+     "referenced_type" : "type-576"
     },
     {
      "referenced_type" : "type-103"
     }
    ],
-   "referenced_type" : "type-812",
+   "referenced_type" : "type-575",
    "return_type" : "type-151",
-   "self_type" : "type-812",
+   "self_type" : "type-575",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   }
  ],
@@ -5915,10 +5918,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1661",
+   "return_type" : "type-1433",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5927,10 +5930,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1662",
+   "return_type" : "type-1434",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5939,10 +5942,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1663",
+   "return_type" : "type-1435",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5951,10 +5954,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-1192"
     }
    ],
-   "return_type" : "type-1664",
+   "return_type" : "type-1436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5963,10 +5966,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1665",
+   "return_type" : "type-1437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5978,7 +5981,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-1666",
+   "return_type" : "type-1438",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5987,10 +5990,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1403"
+     "referenced_type" : "type-1171"
     }
    ],
-   "return_type" : "type-1667",
+   "return_type" : "type-1439",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5999,10 +6002,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-1213"
     }
    ],
-   "return_type" : "type-1668",
+   "return_type" : "type-1440",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6011,88 +6014,88 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1669",
+   "return_type" : "type-1441",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
    "function_name" : "android::ColorSpace::linearSRGB",
    "linker_set_key" : "_ZN7android10ColorSpace10linearSRGBEv",
-   "return_type" : "type-945",
+   "return_type" : "type-1039",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
    "function_name" : "android::ColorSpace::ProPhotoRGB",
    "linker_set_key" : "_ZN7android10ColorSpace11ProPhotoRGBEv",
-   "return_type" : "type-945",
+   "return_type" : "type-1039",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
    "function_name" : "android::ColorSpace::extendedSRGB",
    "linker_set_key" : "_ZN7android10ColorSpace12extendedSRGBEv",
-   "return_type" : "type-945",
+   "return_type" : "type-1039",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
    "function_name" : "android::ColorSpace::linearExtendedSRGB",
    "linker_set_key" : "_ZN7android10ColorSpace18linearExtendedSRGBEv",
-   "return_type" : "type-945",
+   "return_type" : "type-1039",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
    "function_name" : "android::ColorSpace::ACES",
    "linker_set_key" : "_ZN7android10ColorSpace4ACESEv",
-   "return_type" : "type-945",
+   "return_type" : "type-1039",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
    "function_name" : "android::ColorSpace::NTSC",
    "linker_set_key" : "_ZN7android10ColorSpace4NTSCEv",
-   "return_type" : "type-945",
+   "return_type" : "type-1039",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
    "function_name" : "android::ColorSpace::sRGB",
    "linker_set_key" : "_ZN7android10ColorSpace4sRGBEv",
-   "return_type" : "type-945",
+   "return_type" : "type-1039",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
    "function_name" : "android::ColorSpace::BT709",
    "linker_set_key" : "_ZN7android10ColorSpace5BT709Ev",
-   "return_type" : "type-945",
+   "return_type" : "type-1039",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
    "function_name" : "android::ColorSpace::DCIP3",
    "linker_set_key" : "_ZN7android10ColorSpace5DCIP3Ev",
-   "return_type" : "type-945",
+   "return_type" : "type-1039",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
    "function_name" : "android::ColorSpace::ACEScg",
    "linker_set_key" : "_ZN7android10ColorSpace6ACEScgEv",
-   "return_type" : "type-945",
+   "return_type" : "type-1039",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
    "function_name" : "android::ColorSpace::BT2020",
    "linker_set_key" : "_ZN7android10ColorSpace6BT2020Ev",
-   "return_type" : "type-945",
+   "return_type" : "type-1039",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
    "function_name" : "android::ColorSpace::AdobeRGB",
    "linker_set_key" : "_ZN7android10ColorSpace8AdobeRGBEv",
-   "return_type" : "type-945",
+   "return_type" : "type-1039",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
    "function_name" : "android::ColorSpace::DisplayP3",
    "linker_set_key" : "_ZN7android10ColorSpace9DisplayP3Ev",
-   "return_type" : "type-945",
+   "return_type" : "type-1039",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6104,13 +6107,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-962"
+     "referenced_type" : "type-1042"
     },
     {
-     "referenced_type" : "type-962"
+     "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-1670",
+   "return_type" : "type-1442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6120,23 +6123,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-897"
+     "referenced_type" : "type-1006"
     },
     {
-     "referenced_type" : "type-918"
+     "referenced_type" : "type-1029"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-986"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-922"
+     "referenced_type" : "type-1033"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1671"
+     "referenced_type" : "type-1443"
     }
    ],
    "return_type" : "type-151",
@@ -6149,28 +6152,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-897"
+     "referenced_type" : "type-1006"
     },
     {
-     "referenced_type" : "type-918"
+     "referenced_type" : "type-1029"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-986"
+     "referenced_type" : "type-1050"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1672"
+     "referenced_type" : "type-1444"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1673"
+     "referenced_type" : "type-1445"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1674"
+     "referenced_type" : "type-1446"
     }
    ],
    "return_type" : "type-151",
@@ -6183,23 +6186,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-897"
+     "referenced_type" : "type-1006"
     },
     {
-     "referenced_type" : "type-918"
+     "referenced_type" : "type-1029"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-986"
+     "referenced_type" : "type-1050"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1675"
+     "referenced_type" : "type-1447"
     }
    ],
    "return_type" : "type-151",
@@ -6212,20 +6215,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-897"
+     "referenced_type" : "type-1006"
     },
     {
-     "referenced_type" : "type-918"
+     "referenced_type" : "type-1029"
     },
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-934"
     },
     {
-     "referenced_type" : "type-922"
+     "referenced_type" : "type-1033"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1676"
+     "referenced_type" : "type-1448"
     }
    ],
    "return_type" : "type-151",
@@ -6238,25 +6241,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-897"
+     "referenced_type" : "type-1006"
     },
     {
-     "referenced_type" : "type-918"
+     "referenced_type" : "type-1029"
     },
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-934"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1677"
+     "referenced_type" : "type-1449"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1678"
+     "referenced_type" : "type-1450"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1679"
+     "referenced_type" : "type-1451"
     }
    ],
    "return_type" : "type-151",
@@ -6269,20 +6272,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-897"
+     "referenced_type" : "type-1006"
     },
     {
-     "referenced_type" : "type-918"
+     "referenced_type" : "type-1029"
     },
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-934"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1680"
+     "referenced_type" : "type-1452"
     }
    ],
    "return_type" : "type-151",
@@ -6295,23 +6298,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-897"
+     "referenced_type" : "type-1006"
     },
     {
-     "referenced_type" : "type-918"
+     "referenced_type" : "type-1029"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-986"
+     "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-922"
+     "referenced_type" : "type-1033"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1681"
+     "referenced_type" : "type-1453"
     }
    ],
    "return_type" : "type-151",
@@ -6324,28 +6327,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-897"
+     "referenced_type" : "type-1006"
     },
     {
-     "referenced_type" : "type-918"
+     "referenced_type" : "type-1029"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-986"
+     "referenced_type" : "type-1050"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1682"
+     "referenced_type" : "type-1454"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1683"
+     "referenced_type" : "type-1455"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1684"
+     "referenced_type" : "type-1456"
     }
    ],
    "return_type" : "type-151",
@@ -6358,23 +6361,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-897"
+     "referenced_type" : "type-1006"
     },
     {
-     "referenced_type" : "type-918"
+     "referenced_type" : "type-1029"
     },
     {
-     "referenced_type" : "type-938"
+     "referenced_type" : "type-1036"
     },
     {
-     "referenced_type" : "type-986"
+     "referenced_type" : "type-1050"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1685"
+     "referenced_type" : "type-1457"
     }
    ],
    "return_type" : "type-151",
@@ -6387,20 +6390,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-897"
+     "referenced_type" : "type-1006"
     },
     {
-     "referenced_type" : "type-918"
+     "referenced_type" : "type-1029"
     },
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-934"
     },
     {
-     "referenced_type" : "type-922"
+     "referenced_type" : "type-1033"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1686"
+     "referenced_type" : "type-1458"
     }
    ],
    "return_type" : "type-151",
@@ -6413,25 +6416,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-897"
+     "referenced_type" : "type-1006"
     },
     {
-     "referenced_type" : "type-918"
+     "referenced_type" : "type-1029"
     },
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-934"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1687"
+     "referenced_type" : "type-1459"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1688"
+     "referenced_type" : "type-1460"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1689"
+     "referenced_type" : "type-1461"
     }
    ],
    "return_type" : "type-151",
@@ -6444,20 +6447,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-897"
+     "referenced_type" : "type-1006"
     },
     {
-     "referenced_type" : "type-918"
+     "referenced_type" : "type-1029"
     },
     {
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-934"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1690"
+     "referenced_type" : "type-1462"
     }
    ],
    "return_type" : "type-151",
@@ -6470,10 +6473,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1655"
+     "referenced_type" : "type-1427"
     },
     {
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1119"
     },
     {
      "referenced_type" : "type-123"
@@ -6501,7 +6504,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1628"
+     "referenced_type" : "type-1400"
     }
    ],
    "return_type" : "type-151",
@@ -6514,10 +6517,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1628"
+     "referenced_type" : "type-1400"
     },
     {
-     "referenced_type" : "type-1629"
+     "referenced_type" : "type-1401"
     }
    ],
    "return_type" : "type-151",
@@ -6530,7 +6533,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-123"
@@ -6559,7 +6562,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     }
    ],
    "return_type" : "type-151",
@@ -6572,10 +6575,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     }
    ],
    "return_type" : "type-103",
@@ -6589,7 +6592,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-123"
@@ -6607,7 +6610,7 @@
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-1691"
+     "referenced_type" : "type-1463"
     }
    ],
    "return_type" : "type-103",
@@ -6621,13 +6624,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-142"
     },
     {
-     "referenced_type" : "type-865"
+     "referenced_type" : "type-629"
     },
     {
      "referenced_type" : "type-123"
@@ -6658,7 +6661,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-123"
@@ -6680,13 +6683,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     },
     {
      "referenced_type" : "type-347"
@@ -6705,10 +6708,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-1692"
+     "referenced_type" : "type-1464"
     },
     {
      "referenced_type" : "type-227"
@@ -6724,7 +6727,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-123"
@@ -6752,10 +6755,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-857",
+   "return_type" : "type-621",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6764,10 +6767,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-857"
+     "referenced_type" : "type-621"
     }
    ],
-   "return_type" : "type-916",
+   "return_type" : "type-680",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6776,10 +6779,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-864"
+     "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-859",
+   "return_type" : "type-623",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6794,10 +6797,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-877"
+     "referenced_type" : "type-636"
     }
    ],
-   "return_type" : "type-915",
+   "return_type" : "type-679",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6807,7 +6810,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-123"
@@ -6817,11 +6820,11 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     }
    ],
    "return_type" : "type-103",
@@ -6834,24 +6837,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     },
     {
      "referenced_type" : "type-251"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     }
    ],
    "return_type" : "type-103",
@@ -6864,7 +6867,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     }
    ],
    "return_type" : "type-103",
@@ -6877,7 +6880,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-123"
@@ -6890,11 +6893,11 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     }
    ],
    "return_type" : "type-103",
@@ -6907,13 +6910,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     },
     {
      "referenced_type" : "type-251"
@@ -6923,11 +6926,11 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     }
    ],
    "return_type" : "type-103",
@@ -6940,7 +6943,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-124"
@@ -6949,7 +6952,7 @@
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     },
     {
      "referenced_type" : "type-251"
@@ -6959,11 +6962,11 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     }
    ],
    "return_type" : "type-103",
@@ -6976,7 +6979,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-123"
@@ -6995,13 +6998,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     },
     {
      "referenced_type" : "type-347"
@@ -7017,19 +7020,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-1479"
+     "referenced_type" : "type-1251"
     },
     {
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1579"
+     "referenced_type" : "type-1351"
     },
     {
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1250"
     }
    ],
    "return_type" : "type-103",
@@ -7042,13 +7045,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-142"
     },
     {
-     "referenced_type" : "type-865"
+     "referenced_type" : "type-629"
     },
     {
      "referenced_type" : "type-123"
@@ -7079,7 +7082,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-123"
@@ -7095,7 +7098,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1693"
+     "referenced_type" : "type-1465"
     }
    ],
    "return_type" : "type-151",
@@ -7108,7 +7111,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-123"
@@ -7129,7 +7132,7 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-1364"
+     "referenced_type" : "type-1132"
     },
     {
      "referenced_type" : "type-6"
@@ -7145,7 +7148,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-123"
@@ -7164,7 +7167,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1694"
+     "referenced_type" : "type-1466"
     }
    ],
    "return_type" : "type-151",
@@ -7177,7 +7180,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     }
    ],
    "return_type" : "type-151",
@@ -7190,13 +7193,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-142"
     },
     {
-     "referenced_type" : "type-865"
+     "referenced_type" : "type-629"
     },
     {
      "referenced_type" : "type-123"
@@ -7227,7 +7230,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-123"
@@ -7243,7 +7246,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1695"
+     "referenced_type" : "type-1467"
     }
    ],
    "return_type" : "type-151",
@@ -7256,7 +7259,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-123"
@@ -7277,7 +7280,7 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-1364"
+     "referenced_type" : "type-1132"
     },
     {
      "referenced_type" : "type-6"
@@ -7293,7 +7296,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-123"
@@ -7312,7 +7315,7 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1696"
+     "referenced_type" : "type-1468"
     }
    ],
    "return_type" : "type-151",
@@ -7325,7 +7328,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     }
    ],
    "return_type" : "type-151",
@@ -7339,7 +7342,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     }
    ],
    "return_type" : "type-151",
@@ -7353,7 +7356,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     }
    ],
    "return_type" : "type-151",
@@ -7367,7 +7370,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     }
    ],
    "return_type" : "type-151",
@@ -7424,10 +7427,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1165"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1119"
     },
     {
      "referenced_type" : "type-123"
@@ -7443,10 +7446,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1165"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-970"
     }
    ],
    "return_type" : "type-151",
@@ -7459,10 +7462,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1165"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-970"
     }
    ],
    "return_type" : "type-151",
@@ -7475,7 +7478,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1165"
+     "referenced_type" : "type-966"
     }
    ],
    "return_type" : "type-151",
@@ -7488,7 +7491,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1165"
+     "referenced_type" : "type-966"
     }
    ],
    "return_type" : "type-151",
@@ -7501,13 +7504,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1165"
+     "referenced_type" : "type-966"
     },
     {
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-1170",
+   "return_type" : "type-971",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7549,13 +7552,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-968"
+     "referenced_type" : "type-1044"
     },
     {
-     "referenced_type" : "type-962"
+     "referenced_type" : "type-1042"
     },
     {
-     "referenced_type" : "type-962"
+     "referenced_type" : "type-1042"
     }
    ],
    "return_type" : "type-151",
@@ -7568,13 +7571,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-968"
+     "referenced_type" : "type-1044"
     },
     {
-     "referenced_type" : "type-962"
+     "referenced_type" : "type-1042"
     },
     {
-     "referenced_type" : "type-962"
+     "referenced_type" : "type-1042"
     }
    ],
    "return_type" : "type-151",
@@ -7587,10 +7590,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-1405"
     },
     {
-     "referenced_type" : "type-1589"
+     "referenced_type" : "type-1361"
     },
     {
      "referenced_type" : "type-284"
@@ -7607,7 +7610,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-1405"
     }
    ],
    "return_type" : "type-151",
@@ -7620,13 +7623,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-1405"
     },
     {
-     "referenced_type" : "type-1589"
+     "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-1697",
+   "return_type" : "type-1469",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7636,7 +7639,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-539"
     },
     {
      "referenced_type" : "type-142"
@@ -7658,7 +7661,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-539"
     },
     {
      "referenced_type" : "type-123"
@@ -7689,13 +7692,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-539"
     },
     {
      "referenced_type" : "type-142"
     },
     {
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     }
    ],
    "return_type" : "type-103",
@@ -7708,7 +7711,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-539"
     },
     {
      "referenced_type" : "type-142"
@@ -7745,7 +7748,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-539"
     },
     {
      "referenced_type" : "type-142"
@@ -7754,7 +7757,7 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     },
     {
      "referenced_type" : "type-347"
@@ -7773,7 +7776,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-539"
     },
     {
      "referenced_type" : "type-142"
@@ -7795,7 +7798,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-539"
     },
     {
      "referenced_type" : "type-142"
@@ -7804,18 +7807,18 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     },
     {
      "referenced_type" : "type-251"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     }
    ],
    "return_type" : "type-103",
@@ -7828,7 +7831,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-539"
     },
     {
      "referenced_type" : "type-142"
@@ -7844,7 +7847,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-539"
     },
     {
      "referenced_type" : "type-142"
@@ -7853,7 +7856,7 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     },
     {
      "referenced_type" : "type-251"
@@ -7863,11 +7866,11 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     }
    ],
    "return_type" : "type-103",
@@ -7880,7 +7883,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-539"
     },
     {
      "referenced_type" : "type-142"
@@ -7892,7 +7895,7 @@
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     },
     {
      "referenced_type" : "type-251"
@@ -7902,11 +7905,11 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     }
    ],
    "return_type" : "type-103",
@@ -7919,7 +7922,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-539"
     },
     {
      "referenced_type" : "type-142"
@@ -7928,7 +7931,7 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     },
     {
      "referenced_type" : "type-347"
@@ -7945,7 +7948,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-539"
     }
    ],
    "return_type" : "type-151",
@@ -7959,7 +7962,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-539"
     }
    ],
    "return_type" : "type-151",
@@ -7971,7 +7974,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1300"
+     "referenced_type" : "type-2298"
     }
    ],
    "return_type" : "type-151",
@@ -7990,7 +7993,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-545"
     },
     {
      "referenced_type" : "type-142"
@@ -8006,7 +8009,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-545"
     },
     {
      "referenced_type" : "type-123"
@@ -8033,7 +8036,7 @@
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-1698"
+     "referenced_type" : "type-1470"
     }
    ],
    "return_type" : "type-103",
@@ -8047,7 +8050,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-545"
     }
    ],
    "return_type" : "type-151",
@@ -8061,7 +8064,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-545"
     }
    ],
    "return_type" : "type-151",
@@ -8075,7 +8078,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-545"
     }
    ],
    "return_type" : "type-151",
@@ -8089,7 +8092,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-783"
+     "referenced_type" : "type-545"
     }
    ],
    "return_type" : "type-151",
@@ -8102,7 +8105,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1587"
+     "referenced_type" : "type-1359"
     }
    ],
    "return_type" : "type-151",
@@ -8115,7 +8118,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1587"
+     "referenced_type" : "type-1359"
     }
    ],
    "return_type" : "type-151",
@@ -8128,7 +8131,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1288"
+     "referenced_type" : "type-2285"
     },
     {
      "referenced_type" : "type-10"
@@ -8147,7 +8150,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1288"
+     "referenced_type" : "type-2285"
     },
     {
      "referenced_type" : "type-10"
@@ -8172,7 +8175,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1288"
+     "referenced_type" : "type-2285"
     },
     {
      "referenced_type" : "type-123"
@@ -8194,7 +8197,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1288"
+     "referenced_type" : "type-2285"
     }
    ],
    "return_type" : "type-151",
@@ -8233,10 +8236,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1288"
+     "referenced_type" : "type-2285"
     },
     {
-     "referenced_type" : "type-1290"
+     "referenced_type" : "type-2288"
     }
    ],
    "return_type" : "type-151",
@@ -8249,7 +8252,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1288"
+     "referenced_type" : "type-2285"
     },
     {
      "referenced_type" : "type-123"
@@ -8265,7 +8268,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1288"
+     "referenced_type" : "type-2285"
     }
    ],
    "return_type" : "type-151",
@@ -8278,10 +8281,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1288"
+     "referenced_type" : "type-2285"
     },
     {
-     "referenced_type" : "type-1290"
+     "referenced_type" : "type-2288"
     }
    ],
    "return_type" : "type-151",
@@ -8294,7 +8297,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1288"
+     "referenced_type" : "type-2285"
     },
     {
      "referenced_type" : "type-123"
@@ -8310,7 +8313,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1288"
+     "referenced_type" : "type-2285"
     }
    ],
    "return_type" : "type-151",
@@ -8323,7 +8326,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1288"
+     "referenced_type" : "type-2285"
     }
    ],
    "return_type" : "type-151",
@@ -8336,7 +8339,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1288"
+     "referenced_type" : "type-2285"
     }
    ],
    "return_type" : "type-151",
@@ -8349,13 +8352,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1288"
+     "referenced_type" : "type-2285"
     },
     {
-     "referenced_type" : "type-1290"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-1294",
+   "return_type" : "type-2292",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8365,7 +8368,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1524"
+     "referenced_type" : "type-1296"
     }
    ],
    "return_type" : "type-151",
@@ -8378,7 +8381,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1524"
+     "referenced_type" : "type-1296"
     },
     {
      "referenced_type" : "type-103"
@@ -8393,7 +8396,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-1528",
+   "return_type" : "type-1300",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8403,7 +8406,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1524"
+     "referenced_type" : "type-1296"
     },
     {
      "referenced_type" : "type-103"
@@ -8412,7 +8415,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-1528",
+   "return_type" : "type-1300",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8422,7 +8425,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1524"
+     "referenced_type" : "type-1296"
     },
     {
      "referenced_type" : "type-103"
@@ -8431,7 +8434,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-1528",
+   "return_type" : "type-1300",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8441,7 +8444,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1586"
+     "referenced_type" : "type-1358"
     },
     {
      "referenced_type" : "type-286"
@@ -8457,7 +8460,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1586"
+     "referenced_type" : "type-1358"
     },
     {
      "referenced_type" : "type-103"
@@ -8475,13 +8478,13 @@
      "referenced_type" : "type-286"
     },
     {
-     "referenced_type" : "type-1589"
+     "referenced_type" : "type-1361"
     },
     {
-     "referenced_type" : "type-1589"
+     "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-1585",
+   "return_type" : "type-1357",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8490,16 +8493,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-699"
+     "referenced_type" : "type-889"
     },
     {
-     "referenced_type" : "type-1589"
+     "referenced_type" : "type-1361"
     },
     {
-     "referenced_type" : "type-1589"
+     "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-1585",
+   "return_type" : "type-1357",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8509,19 +8512,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1586"
+     "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-1479"
+     "referenced_type" : "type-1251"
     },
     {
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1579"
+     "referenced_type" : "type-1351"
     },
     {
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1250"
     }
    ],
    "return_type" : "type-103",
@@ -8534,10 +8537,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1586"
+     "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-1569"
+     "referenced_type" : "type-1341"
     }
    ],
    "return_type" : "type-151",
@@ -8550,7 +8553,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1586"
+     "referenced_type" : "type-1358"
     },
     {
      "referenced_type" : "type-103"
@@ -8566,10 +8569,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1586"
+     "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-1569"
+     "referenced_type" : "type-1341"
     }
    ],
    "return_type" : "type-151",
@@ -8582,7 +8585,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1586"
+     "referenced_type" : "type-1358"
     },
     {
      "referenced_type" : "type-103"
@@ -8598,13 +8601,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8614,13 +8617,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8630,10 +8633,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -8642,7 +8645,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8653,16 +8656,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8673,10 +8676,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -8688,7 +8691,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8699,16 +8702,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8718,7 +8721,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-103"
@@ -8727,7 +8730,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8737,10 +8740,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8750,7 +8753,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-103"
@@ -8778,13 +8781,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-2225"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     }
    ],
    "return_type" : "type-151",
@@ -8800,13 +8803,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-2225"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     },
     {
      "referenced_type" : "type-103"
@@ -8828,13 +8831,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-2225"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     }
    ],
    "return_type" : "type-151",
@@ -8850,13 +8853,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-2225"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -8874,10 +8877,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-1238",
+   "return_type" : "type-2221",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8887,10 +8890,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     }
    ],
    "return_type" : "type-151",
@@ -8903,7 +8906,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-103"
@@ -8922,7 +8925,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-123"
@@ -8941,7 +8944,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     }
    ],
    "return_type" : "type-151",
@@ -8954,13 +8957,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8970,13 +8973,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8986,10 +8989,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -8998,7 +9001,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9008,13 +9011,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9024,13 +9027,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9040,10 +9043,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -9052,7 +9055,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9062,13 +9065,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9078,13 +9081,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9094,10 +9097,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -9106,7 +9109,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9116,7 +9119,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-286"
@@ -9136,7 +9139,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
      "referenced_type" : "type-10"
@@ -9145,7 +9148,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9155,10 +9158,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-2225"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -9177,7 +9180,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-2225"
     },
     {
      "referenced_type" : "type-103"
@@ -9196,10 +9199,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1119"
     },
     {
      "referenced_type" : "type-123"
@@ -9215,10 +9218,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     }
    ],
    "return_type" : "type-151",
@@ -9231,10 +9234,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     }
    ],
    "return_type" : "type-151",
@@ -9247,7 +9250,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     }
    ],
    "return_type" : "type-151",
@@ -9260,10 +9263,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     }
    ],
    "return_type" : "type-151",
@@ -9276,10 +9279,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     }
    ],
    "return_type" : "type-151",
@@ -9292,7 +9295,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     }
    ],
    "return_type" : "type-151",
@@ -9305,7 +9308,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     }
    ],
    "return_type" : "type-151",
@@ -9318,7 +9321,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     }
    ],
    "return_type" : "type-151",
@@ -9331,13 +9334,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1243"
+     "referenced_type" : "type-2223"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-1245",
+   "return_type" : "type-2225",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9347,7 +9350,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1621"
+     "referenced_type" : "type-1393"
     }
    ],
    "return_type" : "type-284",
@@ -9360,7 +9363,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1621"
+     "referenced_type" : "type-1393"
     },
     {
      "referenced_type" : "type-284"
@@ -9376,10 +9379,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1621"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1622"
+     "referenced_type" : "type-1394"
     }
    ],
    "return_type" : "type-151",
@@ -9392,19 +9395,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1610"
+     "referenced_type" : "type-1382"
     },
     {
-     "referenced_type" : "type-1479"
+     "referenced_type" : "type-1251"
     },
     {
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1579"
+     "referenced_type" : "type-1351"
     },
     {
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1250"
     }
    ],
    "return_type" : "type-103",
@@ -9417,10 +9420,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1610"
+     "referenced_type" : "type-1382"
     },
     {
-     "referenced_type" : "type-1589"
+     "referenced_type" : "type-1361"
     }
    ],
    "return_type" : "type-151",
@@ -9433,7 +9436,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1610"
+     "referenced_type" : "type-1382"
     },
     {
      "referenced_type" : "type-284"
@@ -9449,10 +9452,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1610"
+     "referenced_type" : "type-1382"
     },
     {
-     "referenced_type" : "type-1589"
+     "referenced_type" : "type-1361"
     }
    ],
    "return_type" : "type-151",
@@ -9465,7 +9468,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1610"
+     "referenced_type" : "type-1382"
     },
     {
      "referenced_type" : "type-284"
@@ -9481,10 +9484,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1621"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1638"
+     "referenced_type" : "type-1410"
     }
    ],
    "return_type" : "type-151",
@@ -9497,10 +9500,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1621"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1589"
+     "referenced_type" : "type-1361"
     }
    ],
    "return_type" : "type-151",
@@ -9514,10 +9517,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1621"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1589"
+     "referenced_type" : "type-1361"
     },
     {
      "referenced_type" : "type-6"
@@ -9533,7 +9536,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1621"
+     "referenced_type" : "type-1393"
     },
     {
      "referenced_type" : "type-284"
@@ -9549,10 +9552,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1621"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1638"
+     "referenced_type" : "type-1410"
     }
    ],
    "return_type" : "type-151",
@@ -9565,10 +9568,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1621"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1589"
+     "referenced_type" : "type-1361"
     }
    ],
    "return_type" : "type-151",
@@ -9582,10 +9585,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1621"
+     "referenced_type" : "type-1393"
     },
     {
-     "referenced_type" : "type-1589"
+     "referenced_type" : "type-1361"
     },
     {
      "referenced_type" : "type-6"
@@ -9601,7 +9604,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1621"
+     "referenced_type" : "type-1393"
     },
     {
      "referenced_type" : "type-284"
@@ -9613,13 +9616,13 @@
   {
    "function_name" : "android::Singleton<android::GraphicBufferMapper>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE11getInstanceEv",
-   "return_type" : "type-765",
+   "return_type" : "type-526",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "type-782",
+   "return_type" : "type-544",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
@@ -9629,7 +9632,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1657"
+     "referenced_type" : "type-1429"
     }
    ],
    "return_type" : "type-6",
@@ -9642,7 +9645,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1657"
+     "referenced_type" : "type-1429"
     }
    ],
    "return_type" : "type-123",
@@ -9655,7 +9658,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1657"
+     "referenced_type" : "type-1429"
     },
     {
      "referenced_type" : "type-227"
@@ -9675,13 +9678,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1119"
     }
    ],
    "return_type" : "type-103",
@@ -9695,7 +9698,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-714"
     },
     {
      "referenced_type" : "type-227"
@@ -9715,7 +9718,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-714"
     },
     {
      "referenced_type" : "type-227"
@@ -9735,13 +9738,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-714"
     },
     {
      "referenced_type" : "type-227"
     },
     {
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1119"
     },
     {
      "referenced_type" : "type-123"
@@ -9758,13 +9761,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-714"
     },
     {
      "referenced_type" : "type-227"
     },
     {
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1119"
     },
     {
      "referenced_type" : "type-123"
@@ -9781,13 +9784,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-714"
     },
     {
      "referenced_type" : "type-227"
     },
     {
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1119"
     },
     {
      "referenced_type" : "type-123"
@@ -9804,13 +9807,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-948"
+     "referenced_type" : "type-714"
     },
     {
      "referenced_type" : "type-227"
     },
     {
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1119"
     },
     {
      "referenced_type" : "type-123"
@@ -9826,7 +9829,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-623"
     }
    ],
    "return_type" : "type-123",
@@ -9839,7 +9842,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-623"
     },
     {
      "referenced_type" : "type-123"
@@ -9870,10 +9873,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-623"
     }
    ],
-   "return_type" : "type-877",
+   "return_type" : "type-636",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9883,7 +9886,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-623"
     }
    ],
    "return_type" : "type-123",
@@ -9896,10 +9899,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-623"
     }
    ],
-   "return_type" : "type-864",
+   "return_type" : "type-628",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9909,19 +9912,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-623"
     },
     {
-     "referenced_type" : "type-1477"
+     "referenced_type" : "type-1249"
     },
     {
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1575"
+     "referenced_type" : "type-1347"
     },
     {
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1250"
     }
    ],
    "return_type" : "type-103",
@@ -9934,7 +9937,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-859"
+     "referenced_type" : "type-623"
     }
    ],
    "return_type" : "type-103",
@@ -9997,7 +10000,7 @@
      "referenced_type" : "type-345"
     },
     {
-     "referenced_type" : "type-1354"
+     "referenced_type" : "type-1122"
     },
     {
      "referenced_type" : "type-346"
@@ -10114,7 +10117,7 @@
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     },
     {
      "referenced_type" : "type-103"
@@ -10142,7 +10145,7 @@
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     },
     {
      "referenced_type" : "type-103"
@@ -10151,10 +10154,10 @@
      "referenced_type" : "type-251"
     },
     {
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     },
     {
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-593"
     }
    ],
    "return_type" : "type-103",
@@ -10196,7 +10199,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1172"
+     "referenced_type" : "type-973"
     }
    ],
    "return_type" : "type-123",
@@ -10209,7 +10212,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1172"
+     "referenced_type" : "type-973"
     },
     {
      "referenced_type" : "type-227"
@@ -10231,7 +10234,7 @@
      "referenced_type" : "type-362"
     }
    ],
-   "return_type" : "type-1795",
+   "return_type" : "type-1566",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10285,16 +10288,29 @@
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
+   "function_name" : "android::GraphicBufferAllocator::getTotalSize",
+   "linker_set_key" : "_ZNK7android22GraphicBufferAllocator12getTotalSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-721"
+    }
+   ],
+   "return_type" : "type-123",
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
+  },
+  {
    "function_name" : "android::GraphicBufferAllocator::dump",
    "linker_set_key" : "_ZNK7android22GraphicBufferAllocator4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-955"
+     "referenced_type" : "type-721"
     },
     {
-     "referenced_type" : "type-957"
+     "referenced_type" : "type-723"
     }
    ],
    "return_type" : "type-151",
@@ -10307,7 +10323,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-103"
@@ -10316,7 +10332,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-1222",
+   "return_type" : "type-1241",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10326,7 +10342,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-6",
@@ -10339,7 +10355,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-123",
@@ -10352,7 +10368,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-10",
@@ -10365,7 +10381,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-10",
@@ -10378,7 +10394,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-10",
@@ -10391,7 +10407,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-10",
@@ -10404,7 +10420,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-286"
@@ -10420,10 +10436,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     },
     {
-     "referenced_type" : "type-1295"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-286"
@@ -10440,7 +10456,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-123",
@@ -10453,7 +10469,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     }
    ],
    "return_type" : "type-123",
@@ -10466,10 +10482,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     }
    ],
-   "return_type" : "type-1286",
+   "return_type" : "type-2283",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10479,10 +10495,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     }
    ],
-   "return_type" : "type-1279",
+   "return_type" : "type-2276",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10492,17 +10508,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     },
     {
      "default_arg" : true,
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-1222",
+   "return_type" : "type-1241",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10512,13 +10528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-1238",
+   "return_type" : "type-2221",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10528,10 +10544,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     },
     {
-     "referenced_type" : "type-986"
+     "referenced_type" : "type-1050"
     }
    ],
    "return_type" : "type-22",
@@ -10544,10 +10560,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     },
     {
-     "referenced_type" : "type-990"
+     "referenced_type" : "type-1054"
     }
    ],
    "return_type" : "type-17",
@@ -10560,13 +10576,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     },
     {
-     "referenced_type" : "type-1508"
+     "referenced_type" : "type-1280"
     }
    ],
-   "return_type" : "type-1503",
+   "return_type" : "type-1275",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10576,7 +10592,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-103"
@@ -10595,13 +10611,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-990",
+   "return_type" : "type-1054",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10611,13 +10627,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1293"
+     "referenced_type" : "type-2291"
     },
     {
-     "referenced_type" : "type-1290"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-1286",
+   "return_type" : "type-2283",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10627,13 +10643,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1527"
+     "referenced_type" : "type-1299"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1222",
+   "return_type" : "type-1241",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -10643,13 +10659,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1527"
+     "referenced_type" : "type-1299"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-1524"
+     "referenced_type" : "type-1296"
     }
    ],
    "return_type" : "type-6",
@@ -10662,7 +10678,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1527"
+     "referenced_type" : "type-1299"
     },
     {
      "referenced_type" : "type-123"
@@ -10674,7 +10690,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-1222",
+   "return_type" : "type-1241",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -10684,10 +10700,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1527"
+     "referenced_type" : "type-1299"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     }
    ],
    "return_type" : "type-6",
@@ -10700,13 +10716,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1527"
+     "referenced_type" : "type-1299"
     },
     {
-     "referenced_type" : "type-1512"
+     "referenced_type" : "type-1284"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1240",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -10716,13 +10732,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1527"
+     "referenced_type" : "type-1299"
     },
     {
-     "referenced_type" : "type-1512"
+     "referenced_type" : "type-1284"
     }
    ],
-   "return_type" : "type-1472",
+   "return_type" : "type-1240",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -10732,7 +10748,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1573"
+     "referenced_type" : "type-1345"
     }
    ],
    "return_type" : "type-123",
@@ -10745,7 +10761,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1573"
+     "referenced_type" : "type-1345"
     }
    ],
    "return_type" : "type-284",
@@ -10758,7 +10774,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1573"
+     "referenced_type" : "type-1345"
     }
    ],
    "return_type" : "type-123",
@@ -10771,7 +10787,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1573"
+     "referenced_type" : "type-1345"
     }
    ],
    "return_type" : "type-103",
@@ -10784,19 +10800,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1573"
+     "referenced_type" : "type-1345"
     },
     {
-     "referenced_type" : "type-1477"
+     "referenced_type" : "type-1249"
     },
     {
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1575"
+     "referenced_type" : "type-1347"
     },
     {
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1250"
     }
    ],
    "return_type" : "type-103",
@@ -10809,13 +10825,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1242",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10825,13 +10841,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-1242",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10841,10 +10857,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -10853,7 +10869,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-1242",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10863,7 +10879,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     }
    ],
    "return_type" : "type-123",
@@ -10876,10 +10892,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     }
    ],
    "return_type" : "type-6",
@@ -10892,10 +10908,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-1527",
+   "return_type" : "type-1299",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10905,7 +10921,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-286"
@@ -10925,10 +10941,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-1247"
+     "referenced_type" : "type-2228"
     },
     {
      "referenced_type" : "type-286"
@@ -10948,10 +10964,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-1527",
+   "return_type" : "type-1299",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10961,13 +10977,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1242",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10977,13 +10993,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-1242",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10993,10 +11009,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -11005,7 +11021,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-1242",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11015,7 +11031,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-227"
@@ -11034,10 +11050,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-1512"
+     "referenced_type" : "type-1284"
     }
    ],
    "return_type" : "type-6",
@@ -11050,7 +11066,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-103"
@@ -11069,13 +11085,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-122"
     }
    ],
-   "return_type" : "type-1527",
+   "return_type" : "type-1299",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11085,13 +11101,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1242",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11101,13 +11117,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-1242",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11117,10 +11133,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -11129,7 +11145,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-1242",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11139,13 +11155,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1242",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11155,13 +11171,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     }
    ],
-   "return_type" : "type-1242",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11171,10 +11187,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -11183,7 +11199,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-1242",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11194,16 +11210,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-1246"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-1242",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11214,10 +11230,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-103"
@@ -11229,7 +11245,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-1242",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11240,16 +11256,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-1244"
+     "referenced_type" : "type-2224"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-1242",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11259,7 +11275,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1246"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-103"
@@ -11268,7 +11284,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-1242",
+   "return_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11279,7 +11295,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1230"
+     "referenced_type" : "type-2219"
     },
     {
      "referenced_type" : "type-227"
@@ -11299,7 +11315,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1230"
+     "referenced_type" : "type-2219"
     },
     {
      "referenced_type" : "type-227"
@@ -11319,13 +11335,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1230"
+     "referenced_type" : "type-2219"
     },
     {
      "referenced_type" : "type-227"
     },
     {
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1119"
     },
     {
      "referenced_type" : "type-123"
@@ -11342,13 +11358,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1230"
+     "referenced_type" : "type-2219"
     },
     {
      "referenced_type" : "type-227"
     },
     {
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1119"
     },
     {
      "referenced_type" : "type-123"
@@ -11365,13 +11381,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1230"
+     "referenced_type" : "type-2219"
     },
     {
      "referenced_type" : "type-227"
     },
     {
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1119"
     },
     {
      "referenced_type" : "type-123"
@@ -11388,13 +11404,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1230"
+     "referenced_type" : "type-2219"
     },
     {
      "referenced_type" : "type-227"
     },
     {
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1119"
     },
     {
      "referenced_type" : "type-123"
@@ -11410,10 +11426,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1624"
+     "referenced_type" : "type-1396"
     }
    ],
-   "return_type" : "type-1611",
+   "return_type" : "type-1383",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11423,7 +11439,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1624"
+     "referenced_type" : "type-1396"
     }
    ],
    "return_type" : "type-284",
@@ -11436,7 +11452,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1624"
+     "referenced_type" : "type-1396"
     }
    ],
    "return_type" : "type-6",
@@ -11449,7 +11465,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1617"
+     "referenced_type" : "type-1389"
     }
    ],
    "return_type" : "type-123",
@@ -11462,7 +11478,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1617"
+     "referenced_type" : "type-1389"
     }
    ],
    "return_type" : "type-123",
@@ -11475,19 +11491,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1617"
+     "referenced_type" : "type-1389"
     },
     {
-     "referenced_type" : "type-1477"
+     "referenced_type" : "type-1249"
     },
     {
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1250"
     },
     {
-     "referenced_type" : "type-1575"
+     "referenced_type" : "type-1347"
     },
     {
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1250"
     }
    ],
    "return_type" : "type-103",
@@ -11500,7 +11516,7 @@
    "access" : "private",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator10sAllocListE",
    "name" : "android::GraphicBufferAllocator::sAllocList",
-   "referenced_type" : "type-1799",
+   "referenced_type" : "type-1570",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -11513,43 +11529,43 @@
   {
    "linker_set_key" : "_ZN7android2ui4Size5EMPTYE",
    "name" : "android::ui::Size::EMPTY",
-   "referenced_type" : "type-1518",
+   "referenced_type" : "type-1290",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
   },
   {
    "linker_set_key" : "_ZN7android2ui4Size7INVALIDE",
    "name" : "android::ui::Size::INVALID",
-   "referenced_type" : "type-1518",
+   "referenced_type" : "type-1290",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
   },
   {
    "linker_set_key" : "_ZN7android4Rect10EMPTY_RECTE",
    "name" : "android::Rect::EMPTY_RECT",
-   "referenced_type" : "type-1472",
+   "referenced_type" : "type-1240",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "linker_set_key" : "_ZN7android4Rect12INVALID_RECTE",
    "name" : "android::Rect::INVALID_RECT",
-   "referenced_type" : "type-1472",
+   "referenced_type" : "type-1240",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
    "linker_set_key" : "_ZN7android5Fence8NO_FENCEE",
    "name" : "android::Fence::NO_FENCE",
-   "referenced_type" : "type-1588",
+   "referenced_type" : "type-1360",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-1242",
+   "referenced_type" : "type-2220",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
    "linker_set_key" : "_ZN7android9FenceTime8NO_FENCEE",
    "name" : "android::FenceTime::NO_FENCE",
-   "referenced_type" : "type-1619",
+   "referenced_type" : "type-1391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11563,7 +11579,7 @@
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sInstance",
-   "referenced_type" : "type-777",
+   "referenced_type" : "type-539",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
@@ -11577,7 +11593,7 @@
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sInstance",
-   "referenced_type" : "type-783",
+   "referenced_type" : "type-545",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   }
  ],
@@ -11587,8 +11603,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &",
    "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1387",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -11596,8 +11612,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1408",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -11605,8 +11621,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator &",
    "name" : "android::GraphicBufferAllocator &",
-   "referenced_type" : "type-780",
-   "self_type" : "type-782",
+   "referenced_type" : "type-542",
+   "self_type" : "type-544",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11614,8 +11630,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-527",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11623,8 +11639,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HdrCapabilities &",
    "name" : "android::HdrCapabilities &",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-964",
+   "self_type" : "type-971",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -11641,8 +11657,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Point &",
    "name" : "android::Point &",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1513",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1285",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
   },
@@ -11659,8 +11675,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-1222",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1300",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
@@ -11668,8 +11684,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2225",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11687,7 +11703,7 @@
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
    "referenced_type" : "type-285",
-   "self_type" : "type-706",
+   "self_type" : "type-890",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11695,8 +11711,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11704,8 +11720,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat33<float> &",
    "name" : "android::details::TMat33<float> &",
-   "referenced_type" : "type-718",
-   "self_type" : "type-861",
+   "referenced_type" : "type-903",
+   "self_type" : "type-978",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
@@ -11713,8 +11729,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2282",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11723,7 +11739,7 @@
    "linker_set_key" : "android::details::TQuaternion<double> &",
    "name" : "android::details::TQuaternion<double> &",
    "referenced_type" : "type-331",
-   "self_type" : "type-399",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11731,8 +11747,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> &",
    "name" : "android::details::TQuaternion<float> &",
-   "referenced_type" : "type-400",
-   "self_type" : "type-439",
+   "referenced_type" : "type-410",
+   "self_type" : "type-438",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11740,8 +11756,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<bool> &",
    "name" : "android::details::TVec2<bool> &",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1557",
+   "referenced_type" : "type-1266",
+   "self_type" : "type-1329",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -11750,7 +11766,7 @@
    "linker_set_key" : "android::details::TVec2<double> &",
    "name" : "android::details::TVec2<double> &",
    "referenced_type" : "type-55",
-   "self_type" : "type-1313",
+   "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -11759,7 +11775,7 @@
    "linker_set_key" : "android::details::TVec2<float> &",
    "name" : "android::details::TVec2<float> &",
    "referenced_type" : "type-22",
-   "self_type" : "type-981",
+   "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -11768,7 +11784,7 @@
    "linker_set_key" : "android::details::TVec3<double> &",
    "name" : "android::details::TVec3<double> &",
    "referenced_type" : "type-66",
-   "self_type" : "type-1618",
+   "self_type" : "type-1390",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -11777,7 +11793,7 @@
    "linker_set_key" : "android::details::TVec3<float> &",
    "name" : "android::details::TVec3<float> &",
    "referenced_type" : "type-17",
-   "self_type" : "type-988",
+   "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -11812,8 +11828,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-635",
-   "self_type" : "type-641",
+   "referenced_type" : "type-393",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11830,8 +11846,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1553",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1325",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11840,7 +11856,7 @@
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
    "referenced_type" : "type-102",
-   "self_type" : "type-1541",
+   "self_type" : "type-1313",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11848,8 +11864,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1657",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11857,8 +11873,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2006",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-1777",
+   "self_type" : "type-1776",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11875,8 +11891,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2787",
-   "self_type" : "type-2786",
+   "referenced_type" : "type-2627",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11884,8 +11900,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2906",
-   "self_type" : "type-2905",
+   "referenced_type" : "type-2841",
+   "self_type" : "type-2840",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11893,8 +11909,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-578",
-   "self_type" : "type-577",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2916",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11902,8 +11918,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-670",
-   "self_type" : "type-669",
+   "referenced_type" : "type-431",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11920,8 +11936,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1090",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11938,8 +11954,8 @@
    "alignment" : 4,
    "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-930",
-   "self_type" : "type-939",
+   "referenced_type" : "type-694",
+   "self_type" : "type-705",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -11947,8 +11963,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1639",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11965,8 +11981,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-728",
-   "self_type" : "type-733",
+   "referenced_type" : "type-484",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11992,8 +12008,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-740",
-   "self_type" : "type-745",
+   "referenced_type" : "type-497",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12001,8 +12017,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-1286",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2292",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12011,100 +12027,100 @@
    "linker_set_key" : "bool &",
    "name" : "bool &",
    "referenced_type" : "type-6",
-   "self_type" : "type-1526",
+   "self_type" : "type-1298",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-1258",
-   "self_type" : "type-1260",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1047",
    "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-2433",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2230",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-3333",
-   "self_type" : "type-3357",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2251",
    "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-3380",
-   "self_type" : "type-3382",
+   "referenced_type" : "type-2740",
+   "self_type" : "type-2742",
    "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-417",
-   "self_type" : "type-419",
+   "referenced_type" : "type-3102",
+   "self_type" : "type-3134",
    "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-942",
-   "self_type" : "type-977",
+   "referenced_type" : "type-3368",
+   "self_type" : "type-3370",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-1276",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2149",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2368",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2275",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-3268",
-   "self_type" : "type-3278",
+   "referenced_type" : "type-2731",
+   "self_type" : "type-2733",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-3395",
-   "self_type" : "type-3397",
+   "referenced_type" : "type-3015",
+   "self_type" : "type-3025",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-408",
-   "self_type" : "type-410",
+   "referenced_type" : "type-3378",
+   "self_type" : "type-3380",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-835",
-   "self_type" : "type-846",
+   "referenced_type" : "type-961",
+   "self_type" : "type-974",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace &",
    "name" : "const android::ColorSpace &",
-   "referenced_type" : "type-945",
-   "self_type" : "type-962",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1042",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12112,8 +12128,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace::TransferParameters &",
    "name" : "const android::ColorSpace::TransferParameters &",
-   "referenced_type" : "type-922",
-   "self_type" : "type-956",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12121,8 +12137,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot &",
    "name" : "const android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1616",
-   "self_type" : "type-1622",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12130,8 +12146,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1635",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -12139,8 +12155,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FloatRect &",
    "name" : "const android::FloatRect &",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1508",
+   "referenced_type" : "type-1278",
+   "self_type" : "type-1280",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
   },
@@ -12157,8 +12173,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1039",
-   "self_type" : "type-1038",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12166,8 +12182,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1062",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2008",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12175,8 +12191,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2104",
-   "self_type" : "type-2103",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2014",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12184,8 +12200,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2238",
-   "self_type" : "type-2237",
+   "referenced_type" : "type-3028",
+   "self_type" : "type-3027",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12193,8 +12209,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-3194",
+   "self_type" : "type-3193",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12202,8 +12218,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3004",
-   "self_type" : "type-3003",
+   "referenced_type" : "type-3198",
+   "self_type" : "type-3197",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12211,8 +12227,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3138",
-   "self_type" : "type-3137",
+   "referenced_type" : "type-612",
+   "self_type" : "type-611",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12220,8 +12236,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3144",
-   "self_type" : "type-3143",
+   "referenced_type" : "type-802",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12229,8 +12245,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-848",
-   "self_type" : "type-847",
+   "referenced_type" : "type-827",
+   "self_type" : "type-826",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12238,8 +12254,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t &",
-   "referenced_type" : "type-940",
-   "self_type" : "type-941",
+   "referenced_type" : "type-706",
+   "self_type" : "type-707",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12247,8 +12263,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper &",
    "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-850",
-   "self_type" : "type-866",
+   "referenced_type" : "type-614",
+   "self_type" : "type-630",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -12256,8 +12272,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Point &",
    "name" : "const android::Point &",
-   "referenced_type" : "type-1510",
-   "self_type" : "type-1512",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1284",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
   },
@@ -12265,8 +12281,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1246",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
@@ -12274,8 +12290,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1244",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2224",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12292,8 +12308,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-681",
-   "self_type" : "type-699",
+   "referenced_type" : "type-873",
+   "self_type" : "type-889",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12301,8 +12317,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-1227",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12310,8 +12326,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> &",
    "name" : "const android::details::TMat33<float> &",
-   "referenced_type" : "type-775",
-   "self_type" : "type-776",
+   "referenced_type" : "type-925",
+   "self_type" : "type-934",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -12319,8 +12335,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2281",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12328,8 +12344,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<double> &",
    "name" : "const android::details::TQuaternion<double> &",
-   "referenced_type" : "type-395",
-   "self_type" : "type-396",
+   "referenced_type" : "type-404",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12337,7 +12353,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<float> &",
    "name" : "const android::details::TQuaternion<float> &",
-   "referenced_type" : "type-429",
+   "referenced_type" : "type-432",
    "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
@@ -12346,8 +12362,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec2<bool> &",
    "name" : "const android::details::TVec2<bool> &",
-   "referenced_type" : "type-1493",
-   "self_type" : "type-1525",
+   "referenced_type" : "type-1265",
+   "self_type" : "type-1297",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12355,8 +12371,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec2<double> &",
    "name" : "const android::details::TVec2<double> &",
-   "referenced_type" : "type-1302",
-   "self_type" : "type-1305",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1073",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -12364,8 +12380,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec2<float> &",
    "name" : "const android::details::TVec2<float> &",
-   "referenced_type" : "type-987",
-   "self_type" : "type-986",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1050",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12373,8 +12389,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec3<double> &",
    "name" : "const android::details::TVec3<double> &",
-   "referenced_type" : "type-1597",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1373",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -12382,8 +12398,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec3<float> &",
    "name" : "const android::details::TVec3<float> &",
-   "referenced_type" : "type-991",
-   "self_type" : "type-990",
+   "referenced_type" : "type-1055",
+   "self_type" : "type-1054",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12418,8 +12434,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-1538",
-   "self_type" : "type-1539",
+   "referenced_type" : "type-1310",
+   "self_type" : "type-1311",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -12427,8 +12443,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> &",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10> &",
-   "referenced_type" : "type-1338",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1120",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12436,8 +12452,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> &",
    "name" : "const android::hardware::hidl_array<unsigned int, 10> &",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1128",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12445,8 +12461,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1121",
+   "self_type" : "type-1122",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12454,8 +12470,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-1320",
-   "self_type" : "type-1321",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1089",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12463,8 +12479,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1084",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12481,8 +12497,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-1115",
+   "self_type" : "type-1117",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12490,8 +12506,8 @@
    "alignment" : 4,
    "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-929",
-   "self_type" : "type-931",
+   "referenced_type" : "type-693",
+   "self_type" : "type-695",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12499,8 +12515,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12526,8 +12542,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-1124",
+   "self_type" : "type-1123",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12535,8 +12551,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Size &",
    "name" : "const android::ui::Size &",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1520",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1292",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
   },
@@ -12544,8 +12560,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2288",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12554,7 +12570,7 @@
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
    "referenced_type" : "type-370",
-   "self_type" : "type-1504",
+   "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -12562,8 +12578,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-666",
-   "self_type" : "type-671",
+   "referenced_type" : "type-853",
+   "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12571,59 +12587,59 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-800",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-563",
+   "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.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-1023",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1063",
    "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-1264",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2258",
    "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-2454",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2264",
    "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-3383",
-   "self_type" : "type-3385",
+   "referenced_type" : "type-2743",
+   "self_type" : "type-2745",
    "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-3386",
-   "self_type" : "type-3390",
+   "referenced_type" : "type-3178",
+   "self_type" : "type-3190",
    "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-421",
-   "self_type" : "type-423",
+   "referenced_type" : "type-3371",
+   "self_type" : "type-3373",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-647",
-   "self_type" : "type-646",
+   "referenced_type" : "type-562",
+   "self_type" : "type-837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12631,30 +12647,16 @@
    "alignment" : 4,
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1579",
+   "referenced_type" : "type-1348",
+   "self_type" : "type-1351",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1080",
-   "self_type" : "type-1082",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1124",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1176",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1096",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12667,134 +12669,148 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1578",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1840",
-   "self_type" : "type-1842",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1769",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1996",
-   "self_type" : "type-1998",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1894",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2123",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1968",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2197",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2044",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2096",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2325",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2158",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2324",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2482",
-   "self_type" : "type-2484",
+   "referenced_type" : "type-2545",
+   "self_type" : "type-2547",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2705",
-   "self_type" : "type-2707",
+   "referenced_type" : "type-2580",
+   "self_type" : "type-2582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2740",
-   "self_type" : "type-2742",
+   "referenced_type" : "type-2755",
+   "self_type" : "type-2757",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2896",
-   "self_type" : "type-2898",
+   "referenced_type" : "type-2816",
+   "self_type" : "type-2818",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3021",
-   "self_type" : "type-3023",
+   "referenced_type" : "type-2835",
+   "self_type" : "type-2837",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3095",
-   "self_type" : "type-3097",
+   "referenced_type" : "type-2902",
+   "self_type" : "type-2904",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3171",
-   "self_type" : "type-3173",
+   "referenced_type" : "type-3048",
+   "self_type" : "type-3050",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3223",
-   "self_type" : "type-3225",
+   "referenced_type" : "type-3139",
+   "self_type" : "type-3142",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3285",
-   "self_type" : "type-3287",
+   "referenced_type" : "type-3216",
+   "self_type" : "type-3218",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3437",
-   "self_type" : "type-3439",
+   "referenced_type" : "type-3258",
+   "self_type" : "type-3260",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3311",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3419",
+   "self_type" : "type-3421",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12807,51 +12823,51 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-436",
-   "self_type" : "type-438",
+   "referenced_type" : "type-416",
+   "self_type" : "type-418",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-532",
-   "self_type" : "type-535",
+   "referenced_type" : "type-640",
+   "self_type" : "type-642",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-566",
-   "self_type" : "type-568",
+   "referenced_type" : "type-747",
+   "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-652",
-   "self_type" : "type-654",
+   "referenced_type" : "type-854",
+   "self_type" : "type-856",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-880",
-   "self_type" : "type-882",
+   "referenced_type" : "type-916",
+   "self_type" : "type-918",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-982",
-   "self_type" : "type-985",
+   "referenced_type" : "type-989",
+   "self_type" : "type-991",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1501",
+   "referenced_type" : "type-1271",
+   "self_type" : "type-1273",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -12859,8 +12875,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-655",
-   "self_type" : "type-656",
+   "referenced_type" : "type-847",
+   "self_type" : "type-848",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12868,8 +12884,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *const &",
    "name" : "const native_handle *const &",
-   "referenced_type" : "type-932",
-   "self_type" : "type-933",
+   "referenced_type" : "type-696",
+   "self_type" : "type-697",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12877,8 +12893,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-631",
-   "self_type" : "type-638",
+   "referenced_type" : "type-825",
+   "self_type" : "type-829",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12886,8 +12902,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-618",
-   "self_type" : "type-622",
+   "referenced_type" : "type-799",
+   "self_type" : "type-804",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12895,8 +12911,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-2430",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1036",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12904,8 +12920,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-3330",
-   "self_type" : "type-3332",
+   "referenced_type" : "type-2201",
+   "self_type" : "type-2203",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12913,8 +12929,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-414",
-   "self_type" : "type-416",
+   "referenced_type" : "type-2737",
+   "self_type" : "type-2739",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12922,8 +12938,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-927",
-   "self_type" : "type-938",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3098",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12931,8 +12947,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-2411",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-1015",
+   "self_type" : "type-1029",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12940,8 +12956,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-3311",
-   "self_type" : "type-3325",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2196",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12949,8 +12965,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-411",
-   "self_type" : "type-413",
+   "referenced_type" : "type-2734",
+   "self_type" : "type-2736",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12958,8 +12974,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-904",
-   "self_type" : "type-918",
+   "referenced_type" : "type-3072",
+   "self_type" : "type-3082",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12967,8 +12983,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-1036",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1066",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12976,8 +12992,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2457",
-   "self_type" : "type-2459",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2287",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12985,8 +13001,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-3391",
-   "self_type" : "type-3394",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2748",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12994,8 +13010,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-424",
-   "self_type" : "type-426",
+   "referenced_type" : "type-3191",
+   "self_type" : "type-3196",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13003,8 +13019,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1619",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1401",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13012,62 +13028,179 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2673",
+   "referenced_type" : "type-2513",
+   "self_type" : "type-2520",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
+   "name" : "const std::shared_ptr<android::FenceTime> &",
+   "referenced_type" : "type-2808",
+   "self_type" : "type-2810",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
+   "name" : "const std::shared_ptr<android::FenceTime> &",
+   "referenced_type" : "type-3610",
+   "self_type" : "type-3617",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
+   "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2144",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
+   "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
+   "referenced_type" : "type-3299",
+   "self_type" : "type-3301",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
+  },
+  {
+   "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-967",
+   "self_type" : "type-969",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1030",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1237",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1711",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1817",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-1951",
+   "self_type" : "type-1950",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2019",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2136",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2197",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2415",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2549",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-2681",
    "self_type" : "type-2680",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
-   "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-3628",
-   "self_type" : "type-3635",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
-   "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-511",
-   "self_type" : "type-514",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "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-1166",
-   "self_type" : "type-1168",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
-  },
-  {
-   "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-2371",
-   "self_type" : "type-2373",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
-  },
-  {
-   "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-3271",
-   "self_type" : "type-3273",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1065",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-2794",
+   "self_type" : "type-2793",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13075,8 +13208,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1160",
-   "self_type" : "type-1159",
+   "referenced_type" : "type-2820",
+   "self_type" : "type-2819",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13084,8 +13217,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1214",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-2871",
+   "self_type" : "type-2870",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13093,8 +13226,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-2962",
+   "self_type" : "type-2961",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13102,8 +13235,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1809",
+   "referenced_type" : "type-3043",
+   "self_type" : "type-3042",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13111,8 +13244,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1941",
-   "self_type" : "type-1940",
+   "referenced_type" : "type-3118",
+   "self_type" : "type-3117",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13120,125 +13253,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2047",
-   "self_type" : "type-2046",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2116",
-   "self_type" : "type-2115",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2180",
-   "self_type" : "type-2179",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2248",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2365",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2426",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2576",
-   "self_type" : "type-2575",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2710",
-   "self_type" : "type-2709",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2841",
-   "self_type" : "type-2840",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2947",
-   "self_type" : "type-2946",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3016",
-   "self_type" : "type-3015",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3080",
-   "self_type" : "type-3079",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3149",
-   "self_type" : "type-3148",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3266",
-   "self_type" : "type-3265",
+   "referenced_type" : "type-3201",
+   "self_type" : "type-3200",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13255,8 +13271,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3327",
-   "self_type" : "type-3326",
+   "referenced_type" : "type-3296",
+   "self_type" : "type-3295",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13264,8 +13280,17 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3531",
-   "self_type" : "type-3530",
+   "referenced_type" : "type-3347",
+   "self_type" : "type-3346",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3512",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13282,8 +13307,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-480",
-   "self_type" : "type-479",
+   "referenced_type" : "type-478",
+   "self_type" : "type-477",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13291,8 +13316,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-539",
-   "self_type" : "type-538",
+   "referenced_type" : "type-633",
+   "self_type" : "type-632",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13300,8 +13325,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-615",
-   "self_type" : "type-614",
+   "referenced_type" : "type-726",
+   "self_type" : "type-725",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13309,8 +13334,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-715",
-   "self_type" : "type-714",
+   "referenced_type" : "type-832",
+   "self_type" : "type-831",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13318,17 +13343,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-875",
-   "self_type" : "type-874",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-960",
-   "self_type" : "type-959",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13337,7 +13353,7 @@
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
    "referenced_type" : "type-224",
-   "self_type" : "type-627",
+   "self_type" : "type-821",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13346,7 +13362,7 @@
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
    "referenced_type" : "type-236",
-   "self_type" : "type-651",
+   "self_type" : "type-846",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13355,7 +13371,7 @@
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
    "referenced_type" : "type-226",
-   "self_type" : "type-663",
+   "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13363,8 +13379,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-644",
-   "self_type" : "type-645",
+   "referenced_type" : "type-830",
+   "self_type" : "type-834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13372,8 +13388,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *&",
    "name" : "const void *&",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1479",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13382,7 +13398,7 @@
    "linker_set_key" : "float &",
    "name" : "float &",
    "referenced_type" : "type-10",
-   "self_type" : "type-1467",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -13391,7 +13407,7 @@
    "linker_set_key" : "int &",
    "name" : "int &",
    "referenced_type" : "type-103",
-   "self_type" : "type-1377",
+   "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"
   },
@@ -13399,8 +13415,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-830",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-593",
+   "self_type" : "type-1347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -13409,7 +13425,7 @@
    "linker_set_key" : "long long &",
    "name" : "long long &",
    "referenced_type" : "type-284",
-   "self_type" : "type-1637",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13417,8 +13433,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-1268",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1935",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13426,8 +13442,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-2165",
-   "self_type" : "type-2164",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13435,8 +13451,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-3065",
-   "self_type" : "type-3064",
+   "referenced_type" : "type-2722",
+   "self_type" : "type-2721",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13444,8 +13460,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-3389",
-   "self_type" : "type-3388",
+   "referenced_type" : "type-2823",
+   "self_type" : "type-2822",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13453,8 +13469,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-391",
-   "self_type" : "type-390",
+   "referenced_type" : "type-3375",
+   "self_type" : "type-3374",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13462,8 +13478,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-545",
-   "self_type" : "type-544",
+   "referenced_type" : "type-703",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13471,35 +13487,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-1248",
-   "self_type" : "type-1247",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1296",
-   "self_type" : "type-1295",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1301",
-   "self_type" : "type-1300",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2178",
-   "self_type" : "type-2177",
+   "referenced_type" : "type-1949",
+   "self_type" : "type-1948",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13507,17 +13496,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-3078",
-   "self_type" : "type-3077",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-3365",
-   "self_type" : "type-3364",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2228",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13525,8 +13505,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-3409",
-   "self_type" : "type-3408",
+   "referenced_type" : "type-2294",
+   "self_type" : "type-2293",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13534,8 +13514,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-3414",
-   "self_type" : "type-3413",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2298",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13543,8 +13523,44 @@
    "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-958",
-   "self_type" : "type-957",
+   "referenced_type" : "type-3116",
+   "self_type" : "type-3115",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3360",
+   "self_type" : "type-3359",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3392",
+   "self_type" : "type-3391",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-3397",
+   "self_type" : "type-3396",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
+   "referenced_type" : "type-724",
+   "self_type" : "type-723",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13553,7 +13569,7 @@
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
    "referenced_type" : "type-123",
-   "self_type" : "type-1478",
+   "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13562,7 +13578,7 @@
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
    "referenced_type" : "type-124",
-   "self_type" : "type-1378",
+   "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"
   },
@@ -13571,7 +13587,7 @@
    "linker_set_key" : "void *&",
    "name" : "void *&",
    "referenced_type" : "type-227",
-   "self_type" : "type-1477",
+   "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   }
@@ -13582,8 +13598,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1879",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13591,8 +13607,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-3009",
-   "self_type" : "type-3008",
+   "referenced_type" : "type-3035",
+   "self_type" : "type-3034",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13600,8 +13616,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-858",
-   "self_type" : "type-857",
+   "referenced_type" : "type-622",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13609,8 +13625,8 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-756",
-   "self_type" : "type-877",
+   "referenced_type" : "type-517",
+   "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -13618,8 +13634,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1578",
-   "self_type" : "type-1577",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13627,8 +13643,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1374",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13636,8 +13652,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2642",
-   "self_type" : "type-2641",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2481",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13645,8 +13661,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2503",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13654,8 +13670,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3597",
-   "self_type" : "type-3596",
+   "referenced_type" : "type-2802",
+   "self_type" : "type-2801",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13663,8 +13679,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3619",
-   "self_type" : "type-3618",
+   "referenced_type" : "type-2807",
+   "self_type" : "type-2806",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13672,8 +13688,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-498",
-   "self_type" : "type-497",
+   "referenced_type" : "type-3579",
+   "self_type" : "type-3578",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13681,8 +13697,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3600",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13690,8 +13706,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1562",
+   "referenced_type" : "type-1335",
+   "self_type" : "type-1334",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13699,8 +13715,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1413",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13708,8 +13724,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2632",
-   "self_type" : "type-2631",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2471",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13717,8 +13733,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2689",
-   "self_type" : "type-2688",
+   "referenced_type" : "type-2529",
+   "self_type" : "type-2528",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13726,8 +13742,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3587",
-   "self_type" : "type-3586",
+   "referenced_type" : "type-2797",
+   "self_type" : "type-2796",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13735,8 +13751,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3644",
-   "self_type" : "type-3643",
+   "referenced_type" : "type-2812",
+   "self_type" : "type-2811",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13744,8 +13760,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-488",
-   "self_type" : "type-487",
+   "referenced_type" : "type-3569",
+   "self_type" : "type-3568",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13753,8 +13769,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-519",
-   "self_type" : "type-518",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3625",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13762,8 +13778,8 @@
    "alignment" : 4,
    "linker_set_key" : "alloc_device_t *",
    "name" : "alloc_device_t *",
-   "referenced_type" : "type-837",
-   "self_type" : "type-840",
+   "referenced_type" : "type-601",
+   "self_type" : "type-604",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -13771,35 +13787,17 @@
    "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-755",
-   "self_type" : "type-774",
+   "referenced_type" : "type-516",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::CallStack *",
-   "name" : "android::CallStack *",
-   "referenced_type" : "type-1231",
-   "self_type" : "type-1232",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::CallStack::StackDeleter *",
-   "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1236",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
-   "referenced_type" : "type-867",
-   "self_type" : "type-897",
+   "referenced_type" : "type-979",
+   "self_type" : "type-1006",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -13807,8 +13805,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ColorSpaceConnector *",
    "name" : "android::ColorSpaceConnector *",
-   "referenced_type" : "type-963",
-   "self_type" : "type-968",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1044",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -13825,8 +13823,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1568",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1358",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13834,8 +13832,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime *",
    "name" : "android::FenceTime *",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1393",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13843,8 +13841,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot *",
    "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13852,8 +13850,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTimeline *",
    "name" : "android::FenceTimeline *",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1400",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13861,8 +13859,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceToFenceTimeMap *",
    "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "type-1630",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13870,8 +13868,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FloatRect *",
    "name" : "android::FloatRect *",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1505",
+   "referenced_type" : "type-1275",
+   "self_type" : "type-1277",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
   },
@@ -13879,8 +13877,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FrameStats *",
    "name" : "android::FrameStats *",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -13906,8 +13904,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-764",
-   "self_type" : "type-916",
+   "referenced_type" : "type-525",
+   "self_type" : "type-680",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13915,8 +13913,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator *",
    "name" : "android::GraphicBufferAllocator *",
-   "referenced_type" : "type-780",
-   "self_type" : "type-783",
+   "referenced_type" : "type-542",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13924,8 +13922,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-766",
-   "self_type" : "type-777",
+   "referenced_type" : "type-527",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13933,8 +13931,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HdrCapabilities *",
    "name" : "android::HdrCapabilities *",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-964",
+   "self_type" : "type-966",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -13942,8 +13940,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1908",
-   "self_type" : "type-1907",
+   "referenced_type" : "type-1679",
+   "self_type" : "type-1678",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13951,8 +13949,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2010",
-   "self_type" : "type-2009",
+   "referenced_type" : "type-1781",
+   "self_type" : "type-1780",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13960,8 +13958,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2808",
-   "self_type" : "type-2807",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2647",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13969,8 +13967,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2910",
-   "self_type" : "type-2909",
+   "referenced_type" : "type-2843",
+   "self_type" : "type-2842",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13987,8 +13985,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
+   "referenced_type" : "type-2921",
+   "self_type" : "type-2920",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13996,8 +13994,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
+   "referenced_type" : "type-437",
+   "self_type" : "type-436",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -14005,8 +14003,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-949",
-   "self_type" : "type-950",
+   "referenced_type" : "type-715",
+   "self_type" : "type-716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -14014,8 +14012,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14023,8 +14021,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LightRefBase<android::Fence> *",
    "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-1570",
-   "self_type" : "type-1582",
+   "referenced_type" : "type-1342",
+   "self_type" : "type-1354",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -14050,8 +14048,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Point *",
    "name" : "android::Point *",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1509",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1281",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
   },
@@ -14086,8 +14084,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect *",
    "name" : "android::Rect *",
-   "referenced_type" : "type-1222",
-   "self_type" : "type-1524",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1296",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
@@ -14104,33 +14102,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1078",
-   "self_type" : "type-1077",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1120",
-   "self_type" : "type-1119",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1173",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
    "referenced_type" : "type-118",
    "self_type" : "type-117",
    "size" : 4,
@@ -14140,6 +14111,24 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1337",
+   "self_type" : "type-1336",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1370",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
    "referenced_type" : "type-14",
    "self_type" : "type-13",
    "size" : 4,
@@ -14149,8 +14138,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1564",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1572",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14158,8 +14147,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1599",
-   "self_type" : "type-1598",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14176,8 +14165,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1802",
-   "self_type" : "type-1801",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1764",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14185,8 +14174,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1837",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14194,8 +14183,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14203,8 +14192,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2038",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14212,8 +14201,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14221,8 +14210,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2153",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14230,8 +14219,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2307",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14239,8 +14228,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14248,8 +14237,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2468",
-   "self_type" : "type-2467",
+   "referenced_type" : "type-2500",
+   "self_type" : "type-2499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14257,8 +14246,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2634",
-   "self_type" : "type-2633",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14266,8 +14255,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2660",
-   "self_type" : "type-2659",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2576",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14275,8 +14264,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2702",
-   "self_type" : "type-2701",
+   "referenced_type" : "type-2752",
+   "self_type" : "type-2751",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14284,8 +14273,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2737",
-   "self_type" : "type-2736",
+   "referenced_type" : "type-2799",
+   "self_type" : "type-2798",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14293,8 +14282,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2894",
-   "self_type" : "type-2893",
+   "referenced_type" : "type-2804",
+   "self_type" : "type-2803",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14302,8 +14291,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2968",
-   "self_type" : "type-2967",
+   "referenced_type" : "type-2814",
+   "self_type" : "type-2813",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14311,8 +14300,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3093",
-   "self_type" : "type-3092",
+   "referenced_type" : "type-2833",
+   "self_type" : "type-2832",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14320,8 +14309,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3168",
-   "self_type" : "type-3167",
+   "referenced_type" : "type-2899",
+   "self_type" : "type-2898",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14329,8 +14318,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3221",
-   "self_type" : "type-3220",
+   "referenced_type" : "type-2984",
+   "self_type" : "type-2983",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14338,8 +14327,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3283",
-   "self_type" : "type-3282",
+   "referenced_type" : "type-3136",
+   "self_type" : "type-3135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14347,8 +14336,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3423",
-   "self_type" : "type-3422",
+   "referenced_type" : "type-3214",
+   "self_type" : "type-3213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14356,8 +14345,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3589",
-   "self_type" : "type-3588",
+   "referenced_type" : "type-3256",
+   "self_type" : "type-3255",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14365,8 +14354,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3615",
-   "self_type" : "type-3614",
+   "referenced_type" : "type-3307",
+   "self_type" : "type-3306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14374,8 +14363,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-431",
-   "self_type" : "type-430",
+   "referenced_type" : "type-3405",
+   "self_type" : "type-3404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14383,8 +14372,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-492",
+   "referenced_type" : "type-3571",
+   "self_type" : "type-3570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14392,8 +14381,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-504",
-   "self_type" : "type-503",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14401,8 +14390,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-529",
-   "self_type" : "type-528",
+   "referenced_type" : "type-408",
+   "self_type" : "type-407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14410,8 +14399,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-563",
-   "self_type" : "type-562",
+   "referenced_type" : "type-514",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14419,8 +14408,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-649",
-   "self_type" : "type-648",
+   "referenced_type" : "type-744",
+   "self_type" : "type-743",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14428,8 +14417,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-753",
-   "self_type" : "type-752",
+   "referenced_type" : "type-851",
+   "self_type" : "type-850",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14437,8 +14426,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-979",
-   "self_type" : "type-978",
+   "referenced_type" : "type-914",
+   "self_type" : "type-913",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-987",
+   "self_type" : "type-986",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14455,8 +14453,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-1308",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-1076",
+   "self_type" : "type-1077",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14464,8 +14462,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1243",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2223",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -14473,8 +14471,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ScopedTrace *",
    "name" : "android::ScopedTrace *",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Trace.h"
   },
@@ -14482,8 +14480,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> > *",
    "name" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> > *",
-   "referenced_type" : "type-944",
-   "self_type" : "type-946",
+   "referenced_type" : "type-711",
+   "self_type" : "type-712",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -14501,7 +14499,7 @@
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
    "referenced_type" : "type-285",
-   "self_type" : "type-713",
+   "self_type" : "type-901",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14518,17 +14516,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1226",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-1217",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14536,8 +14525,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1649",
-   "self_type" : "type-1652",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1424",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14545,8 +14534,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1559",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1331",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -14554,8 +14543,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-1569",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1363",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -14563,8 +14552,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat33<float> *",
    "name" : "android::details::TMat33<float> *",
-   "referenced_type" : "type-718",
-   "self_type" : "type-856",
+   "referenced_type" : "type-903",
+   "self_type" : "type-977",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
@@ -14572,8 +14561,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2279",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14581,8 +14570,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat33, float> *",
-   "referenced_type" : "type-725",
-   "self_type" : "type-834",
+   "referenced_type" : "type-910",
+   "self_type" : "type-957",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14590,8 +14579,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-1273",
-   "self_type" : "type-1274",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2271",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14600,7 +14589,7 @@
    "linker_set_key" : "android::details::TQuaternion<double> *",
    "name" : "android::details::TQuaternion<double> *",
    "referenced_type" : "type-331",
-   "self_type" : "type-393",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14608,8 +14597,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> *",
    "name" : "android::details::TQuaternion<float> *",
-   "referenced_type" : "type-400",
-   "self_type" : "type-428",
+   "referenced_type" : "type-410",
+   "self_type" : "type-429",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14617,8 +14606,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<bool> *",
    "name" : "android::details::TVec2<bool> *",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1535",
+   "referenced_type" : "type-1266",
+   "self_type" : "type-1307",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -14627,7 +14616,7 @@
    "linker_set_key" : "android::details::TVec2<double> *",
    "name" : "android::details::TVec2<double> *",
    "referenced_type" : "type-55",
-   "self_type" : "type-1269",
+   "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -14636,7 +14625,7 @@
    "linker_set_key" : "android::details::TVec2<float> *",
    "name" : "android::details::TVec2<float> *",
    "referenced_type" : "type-22",
-   "self_type" : "type-1473",
+   "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -14645,7 +14634,7 @@
    "linker_set_key" : "android::details::TVec3<double> *",
    "name" : "android::details::TVec3<double> *",
    "referenced_type" : "type-66",
-   "self_type" : "type-1596",
+   "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -14681,7 +14670,7 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
    "referenced_type" : "type-28",
-   "self_type" : "type-984",
+   "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -14690,7 +14679,7 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
    "referenced_type" : "type-34",
-   "self_type" : "type-989",
+   "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -14699,7 +14688,7 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
    "referenced_type" : "type-27",
-   "self_type" : "type-995",
+   "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -14708,7 +14697,7 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
    "referenced_type" : "type-33",
-   "self_type" : "type-1004",
+   "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -14717,7 +14706,7 @@
    "linker_set_key" : "android::half *",
    "name" : "android::half *",
    "referenced_type" : "type-1",
-   "self_type" : "type-1609",
+   "self_type" : "type-1381",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14726,7 +14715,7 @@
    "linker_set_key" : "android::half::fp16 *",
    "name" : "android::half::fp16 *",
    "referenced_type" : "type-2",
-   "self_type" : "type-994",
+   "self_type" : "type-1056",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14734,8 +14723,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::half::fp32 *",
    "name" : "android::half::fp32 *",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1306",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1074",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14752,8 +14741,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::GrantorDescriptor *",
    "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1100",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14797,8 +14786,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-635",
-   "self_type" : "type-639",
+   "referenced_type" : "type-393",
+   "self_type" : "type-398",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14815,8 +14804,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1551",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1323",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14825,7 +14814,7 @@
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
    "referenced_type" : "type-102",
-   "self_type" : "type-1537",
+   "self_type" : "type-1309",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14833,8 +14822,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
    "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1484",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14842,8 +14831,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10> *",
    "name" : "android::hardware::details::const_accessor<unsigned int, 10> *",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1337",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1105",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14861,7 +14850,7 @@
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
    "referenced_type" : "type-101",
-   "self_type" : "type-1543",
+   "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14869,8 +14858,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1068",
-   "self_type" : "type-1067",
+   "referenced_type" : "type-1727",
+   "self_type" : "type-1726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14878,8 +14867,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1956",
-   "self_type" : "type-1955",
+   "referenced_type" : "type-1924",
+   "self_type" : "type-1923",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14887,8 +14876,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-1954",
+   "self_type" : "type-1953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14896,8 +14885,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2023",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14905,8 +14894,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2253",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2696",
+   "self_type" : "type-2695",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14914,8 +14903,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2856",
-   "self_type" : "type-2855",
+   "referenced_type" : "type-2878",
+   "self_type" : "type-2877",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14923,8 +14912,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3053",
-   "self_type" : "type-3052",
+   "referenced_type" : "type-3084",
+   "self_type" : "type-3083",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14932,8 +14921,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3083",
-   "self_type" : "type-3082",
+   "referenced_type" : "type-3122",
+   "self_type" : "type-3121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14941,8 +14930,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3153",
-   "self_type" : "type-3152",
+   "referenced_type" : "type-3204",
+   "self_type" : "type-3203",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14959,8 +14948,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-623",
+   "referenced_type" : "type-685",
+   "self_type" : "type-684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14968,8 +14957,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-921",
-   "self_type" : "type-920",
+   "referenced_type" : "type-731",
+   "self_type" : "type-730",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14977,8 +14966,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-965",
-   "self_type" : "type-964",
+   "referenced_type" : "type-836",
+   "self_type" : "type-835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14986,8 +14975,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1074",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-1821",
+   "self_type" : "type-1820",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14995,8 +14984,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2050",
-   "self_type" : "type-2049",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15004,8 +14993,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2030",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15013,8 +15002,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2966",
+   "self_type" : "type-2965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15022,8 +15011,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2950",
-   "self_type" : "type-2949",
+   "referenced_type" : "type-3129",
+   "self_type" : "type-3128",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15031,8 +15020,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-3089",
-   "self_type" : "type-3088",
+   "referenced_type" : "type-3210",
+   "self_type" : "type-3209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15040,8 +15029,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-3160",
-   "self_type" : "type-3159",
+   "referenced_type" : "type-486",
+   "self_type" : "type-485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15049,8 +15038,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-730",
-   "self_type" : "type-729",
+   "referenced_type" : "type-737",
+   "self_type" : "type-736",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15058,8 +15047,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-971",
+   "referenced_type" : "type-843",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15067,8 +15056,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1070",
-   "self_type" : "type-1069",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1715",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15076,8 +15065,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1945",
-   "self_type" : "type-1944",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15085,8 +15074,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-1956",
+   "self_type" : "type-1955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15094,8 +15083,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15103,8 +15092,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2256",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2685",
+   "self_type" : "type-2684",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15112,8 +15101,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2845",
-   "self_type" : "type-2844",
+   "referenced_type" : "type-2884",
+   "self_type" : "type-2883",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15121,8 +15110,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3055",
-   "self_type" : "type-3054",
+   "referenced_type" : "type-3087",
+   "self_type" : "type-3086",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15130,8 +15119,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3085",
-   "self_type" : "type-3084",
+   "referenced_type" : "type-3124",
+   "self_type" : "type-3123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15139,8 +15128,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3156",
-   "self_type" : "type-3155",
+   "referenced_type" : "type-3206",
+   "self_type" : "type-3205",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15157,8 +15146,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-630",
-   "self_type" : "type-629",
+   "referenced_type" : "type-689",
+   "self_type" : "type-688",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15166,8 +15155,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15175,8 +15164,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-967",
-   "self_type" : "type-966",
+   "referenced_type" : "type-839",
+   "self_type" : "type-838",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15184,8 +15173,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1072",
-   "self_type" : "type-1071",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15193,8 +15182,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1815",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15202,8 +15191,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2157",
-   "self_type" : "type-2156",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15211,8 +15200,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2028",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15220,8 +15209,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2258",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2555",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15229,8 +15218,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2716",
-   "self_type" : "type-2715",
+   "referenced_type" : "type-2828",
+   "self_type" : "type-2827",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15238,8 +15227,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3057",
-   "self_type" : "type-3056",
+   "referenced_type" : "type-3089",
+   "self_type" : "type-3088",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15247,8 +15236,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3087",
-   "self_type" : "type-3086",
+   "referenced_type" : "type-3127",
+   "self_type" : "type-3126",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15256,8 +15245,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3158",
-   "self_type" : "type-3157",
+   "referenced_type" : "type-3208",
+   "self_type" : "type-3207",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15265,8 +15254,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-552",
-   "self_type" : "type-551",
+   "referenced_type" : "type-691",
+   "self_type" : "type-690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
+   "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
+   "referenced_type" : "type-735",
+   "self_type" : "type-734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
+   "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
+   "referenced_type" : "type-841",
+   "self_type" : "type-840",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15281,28 +15288,10 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-926",
-   "self_type" : "type-925",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-970",
-   "self_type" : "type-969",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-1953",
-   "self_type" : "type-1952",
+   "referenced_type" : "type-1724",
+   "self_type" : "type-1723",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15310,8 +15299,17 @@
    "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-2853",
-   "self_type" : "type-2852",
+   "referenced_type" : "type-2693",
+   "self_type" : "type-2692",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
+   "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
+   "referenced_type" : "type-2875",
+   "self_type" : "type-2874",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15326,19 +15324,10 @@
   },
   {
    "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-621",
-   "self_type" : "type-620",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1076",
-   "self_type" : "type-1075",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15346,8 +15335,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15355,8 +15344,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2191",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2032",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15364,8 +15353,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2976",
+   "self_type" : "type-2975",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15373,8 +15362,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2960",
-   "self_type" : "type-2959",
+   "referenced_type" : "type-3132",
+   "self_type" : "type-3131",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15382,8 +15371,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3090",
+   "referenced_type" : "type-3212",
+   "self_type" : "type-3211",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15391,8 +15380,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-3162",
-   "self_type" : "type-3161",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15400,8 +15389,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-742",
-   "self_type" : "type-741",
+   "referenced_type" : "type-740",
+   "self_type" : "type-739",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15409,8 +15398,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-975",
-   "self_type" : "type-974",
+   "referenced_type" : "type-845",
+   "self_type" : "type-844",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15418,8 +15407,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10> *",
    "name" : "android::hardware::hidl_array<unsigned int, 10> *",
-   "referenced_type" : "type-1340",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1110",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15427,8 +15416,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1126",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15445,8 +15434,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1086",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15463,8 +15452,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15490,8 +15479,8 @@
    "alignment" : 4,
    "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-930",
-   "self_type" : "type-934",
+   "referenced_type" : "type-694",
+   "self_type" : "type-698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15499,8 +15488,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1587",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1359",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15508,8 +15497,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-915",
-   "self_type" : "type-917",
+   "referenced_type" : "type-679",
+   "self_type" : "type-681",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15526,8 +15515,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-728",
-   "self_type" : "type-732",
+   "referenced_type" : "type-484",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15553,8 +15542,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-740",
-   "self_type" : "type-744",
+   "referenced_type" : "type-497",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15571,8 +15560,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Size *",
    "name" : "android::ui::Size *",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1521",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1293",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
   },
@@ -15580,8 +15569,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-1286",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2285",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15589,8 +15578,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1299",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2297",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15598,8 +15587,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-1226",
+   "self_type" : "type-1229",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -15607,8 +15596,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_native_base_t *",
    "name" : "android_native_base_t *",
-   "referenced_type" : "type-757",
-   "self_type" : "type-761",
+   "referenced_type" : "type-518",
+   "self_type" : "type-522",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -15644,7 +15633,7 @@
    "linker_set_key" : "char *",
    "name" : "char *",
    "referenced_type" : "type-288",
-   "self_type" : "type-813",
+   "self_type" : "type-576",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -15652,8 +15641,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2113",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1884",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15661,8 +15650,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-3011",
-   "self_type" : "type-3013",
+   "referenced_type" : "type-3038",
+   "self_type" : "type-3040",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15670,8 +15659,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-862",
-   "self_type" : "type-864",
+   "referenced_type" : "type-626",
+   "self_type" : "type-628",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15679,8 +15668,8 @@
    "alignment" : 4,
    "linker_set_key" : "const ANativeWindowBuffer *",
    "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-878",
-   "self_type" : "type-879",
+   "referenced_type" : "type-637",
+   "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -15688,26 +15677,17 @@
    "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-772",
-   "self_type" : "type-773",
+   "referenced_type" : "type-535",
+   "self_type" : "type-536",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::CallStack *",
-   "name" : "const android::CallStack *",
-   "referenced_type" : "type-1233",
-   "self_type" : "type-1234",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace *",
    "name" : "const android::ColorSpace *",
-   "referenced_type" : "type-945",
-   "self_type" : "type-953",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1040",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -15715,8 +15695,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorSpaceConnector *",
    "name" : "const android::ColorSpaceConnector *",
-   "referenced_type" : "type-973",
-   "self_type" : "type-976",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1046",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -15724,8 +15704,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-1567",
-   "self_type" : "type-1573",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1345",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -15733,8 +15713,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime *",
    "name" : "const android::FenceTime *",
-   "referenced_type" : "type-1623",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1396",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15742,8 +15722,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot *",
    "name" : "const android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1616",
-   "self_type" : "type-1617",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1389",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15751,8 +15731,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FloatRect *",
    "name" : "const android::FloatRect *",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1507",
+   "referenced_type" : "type-1278",
+   "self_type" : "type-1279",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
   },
@@ -15760,8 +15740,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FrameStats *",
    "name" : "const android::FrameStats *",
-   "referenced_type" : "type-1656",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1429",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -15787,8 +15767,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-860",
-   "self_type" : "type-859",
+   "referenced_type" : "type-624",
+   "self_type" : "type-623",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15796,8 +15776,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferAllocator *",
    "name" : "const android::GraphicBufferAllocator *",
-   "referenced_type" : "type-954",
-   "self_type" : "type-955",
+   "referenced_type" : "type-720",
+   "self_type" : "type-721",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -15805,8 +15785,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper *",
    "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-850",
-   "self_type" : "type-851",
+   "referenced_type" : "type-614",
+   "self_type" : "type-615",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -15814,8 +15794,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::HdrCapabilities *",
    "name" : "const android::HdrCapabilities *",
-   "referenced_type" : "type-1171",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-972",
+   "self_type" : "type-973",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -15823,8 +15803,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-951",
-   "self_type" : "type-952",
+   "referenced_type" : "type-717",
+   "self_type" : "type-718",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15832,8 +15812,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15841,8 +15821,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightRefBase<android::Fence> *",
    "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-1583",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1356",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -15850,8 +15830,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1136",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -15859,8 +15839,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Point *",
    "name" : "const android::Point *",
-   "referenced_type" : "type-1510",
-   "self_type" : "type-1511",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1283",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
   },
@@ -15868,8 +15848,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1527",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1299",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
@@ -15877,8 +15857,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1079",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15886,8 +15866,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-1242",
-   "self_type" : "type-1246",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15895,8 +15875,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> > *",
-   "referenced_type" : "type-947",
-   "self_type" : "type-948",
+   "referenced_type" : "type-713",
+   "self_type" : "type-714",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -15913,8 +15893,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-681",
-   "self_type" : "type-690",
+   "referenced_type" : "type-873",
+   "self_type" : "type-878",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15922,17 +15902,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-1227",
-   "self_type" : "type-1230",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::String8> *",
-   "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1220",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15940,8 +15911,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1654",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15949,8 +15920,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1650",
-   "self_type" : "type-1651",
+   "referenced_type" : "type-1422",
+   "self_type" : "type-1423",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15958,8 +15929,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-1366",
+   "self_type" : "type-1367",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15967,8 +15938,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> *",
    "name" : "const android::details::TMat33<float> *",
-   "referenced_type" : "type-775",
-   "self_type" : "type-854",
+   "referenced_type" : "type-925",
+   "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
@@ -15976,8 +15947,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec2<bool> *",
    "name" : "const android::details::TVec2<bool> *",
-   "referenced_type" : "type-1493",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-1265",
+   "self_type" : "type-1264",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -15985,8 +15956,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec2<float> *",
    "name" : "const android::details::TVec2<float> *",
-   "referenced_type" : "type-987",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1142",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -15994,8 +15965,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec3<float> *",
    "name" : "const android::details::TVec3<float> *",
-   "referenced_type" : "type-991",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1055",
+   "self_type" : "type-1418",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -16012,8 +15983,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::half::fp16 *",
    "name" : "const android::half::fp16 *",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1060",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -16021,8 +15992,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::half::fp32 *",
    "name" : "const android::half::fp32 *",
-   "referenced_type" : "type-1468",
-   "self_type" : "type-1545",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1317",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -16048,8 +16019,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-642",
-   "self_type" : "type-643",
+   "referenced_type" : "type-401",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16066,8 +16037,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-1538",
-   "self_type" : "type-1542",
+   "referenced_type" : "type-1310",
+   "self_type" : "type-1314",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16075,8 +16046,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
-   "referenced_type" : "type-1338",
-   "self_type" : "type-1339",
+   "referenced_type" : "type-1106",
+   "self_type" : "type-1107",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16102,8 +16073,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1548",
+   "referenced_type" : "type-1319",
+   "self_type" : "type-1320",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16111,8 +16082,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-1973",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-1744",
+   "self_type" : "type-1746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16120,8 +16091,17 @@
    "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-2873",
-   "self_type" : "type-2875",
+   "referenced_type" : "type-2713",
+   "self_type" : "type-2715",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
+   "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
+   "referenced_type" : "type-2879",
+   "self_type" : "type-2882",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16136,10 +16116,10 @@
   },
   {
    "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-625",
-   "self_type" : "type-628",
+   "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
+   "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1829",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16147,8 +16127,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-2056",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-2972",
+   "self_type" : "type-2974",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16156,17 +16136,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-2956",
-   "self_type" : "type-2958",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-737",
-   "self_type" : "type-739",
+   "referenced_type" : "type-494",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16192,8 +16163,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-660",
-   "self_type" : "type-659",
+   "referenced_type" : "type-422",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16201,8 +16172,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-1813",
-   "self_type" : "type-1812",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1583",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16210,8 +16181,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-2713",
-   "self_type" : "type-2712",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2552",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16219,8 +16190,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-549",
-   "self_type" : "type-548",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16237,8 +16208,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-1823",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1596",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16246,8 +16217,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-2723",
-   "self_type" : "type-2725",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16255,8 +16226,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-555",
-   "self_type" : "type-557",
+   "referenced_type" : "type-2829",
+   "self_type" : "type-2831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16273,8 +16244,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-1982",
-   "self_type" : "type-1981",
+   "referenced_type" : "type-1753",
+   "self_type" : "type-1752",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16282,8 +16253,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-2882",
-   "self_type" : "type-2881",
+   "referenced_type" : "type-2887",
+   "self_type" : "type-2886",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16291,8 +16262,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-633",
-   "self_type" : "type-632",
+   "referenced_type" : "type-391",
+   "self_type" : "type-390",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16300,8 +16271,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> *",
    "name" : "const android::hardware::hidl_array<unsigned int, 10> *",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16327,8 +16298,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-661",
-   "self_type" : "type-662",
+   "referenced_type" : "type-423",
+   "self_type" : "type-424",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16336,8 +16307,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-1320",
-   "self_type" : "type-1324",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1092",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16363,8 +16334,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-1115",
+   "self_type" : "type-1116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16390,8 +16361,8 @@
    "alignment" : 4,
    "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-929",
-   "self_type" : "type-935",
+   "referenced_type" : "type-693",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16399,8 +16370,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16417,8 +16388,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-735",
-   "self_type" : "type-736",
+   "referenced_type" : "type-492",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16444,8 +16415,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-747",
-   "self_type" : "type-748",
+   "referenced_type" : "type-505",
+   "self_type" : "type-506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16453,8 +16424,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1533",
+   "referenced_type" : "type-1124",
+   "self_type" : "type-1305",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16480,8 +16451,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Size *",
    "name" : "const android::ui::Size *",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1523",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1295",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
   },
@@ -16489,8 +16460,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2291",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16498,8 +16469,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2296",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16525,8 +16496,8 @@
    "alignment" : 4,
    "linker_set_key" : "const gralloc_module_t *",
    "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-819",
-   "self_type" : "type-818",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16534,8 +16505,8 @@
    "alignment" : 4,
    "linker_set_key" : "const hw_module_t *",
    "name" : "const hw_module_t *",
-   "referenced_type" : "type-793",
-   "self_type" : "type-792",
+   "referenced_type" : "type-555",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16543,8 +16514,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-647",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-562",
+   "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -16552,8 +16523,8 @@
    "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-1271",
+   "self_type" : "type-1272",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -16561,8 +16532,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
-   "referenced_type" : "type-655",
-   "self_type" : "type-1643",
+   "referenced_type" : "type-847",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16598,7 +16569,7 @@
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
    "referenced_type" : "type-236",
-   "self_type" : "type-1336",
+   "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16615,8 +16586,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1351",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1119",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16624,8 +16595,8 @@
    "alignment" : 4,
    "linker_set_key" : "framebuffer_device_t *",
    "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-784",
-   "self_type" : "type-804",
+   "referenced_type" : "type-546",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16633,8 +16604,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t *",
    "name" : "hw_device_t *",
-   "referenced_type" : "type-785",
-   "self_type" : "type-795",
+   "referenced_type" : "type-547",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16642,8 +16613,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t **",
    "name" : "hw_device_t **",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
+   "referenced_type" : "type-557",
+   "self_type" : "type-556",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16651,8 +16622,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_methods_t *",
    "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-789",
-   "self_type" : "type-788",
+   "referenced_type" : "type-551",
+   "self_type" : "type-550",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16660,8 +16631,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_t *",
    "name" : "hw_module_t *",
-   "referenced_type" : "type-787",
-   "self_type" : "type-786",
+   "referenced_type" : "type-549",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16669,8 +16640,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(alloc_device_t *, const native_handle *)",
    "name" : "int (*)(alloc_device_t *, const native_handle *)",
-   "referenced_type" : "type-842",
-   "self_type" : "type-841",
+   "referenced_type" : "type-606",
+   "self_type" : "type-605",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16678,8 +16649,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(alloc_device_t *, int, int, int, int, const native_handle **, int *)",
    "name" : "int (*)(alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "referenced_type" : "type-839",
-   "self_type" : "type-838",
+   "referenced_type" : "type-603",
+   "self_type" : "type-602",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16687,8 +16658,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-817",
-   "self_type" : "type-816",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16696,8 +16667,8 @@
    "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-829",
-   "self_type" : "type-828",
+   "referenced_type" : "type-592",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16705,8 +16676,8 @@
    "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-825",
-   "self_type" : "type-824",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16714,8 +16685,8 @@
    "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-832",
-   "self_type" : "type-831",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16723,8 +16694,8 @@
    "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-821",
-   "self_type" : "type-820",
+   "referenced_type" : "type-584",
+   "self_type" : "type-583",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16732,8 +16703,8 @@
    "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-827",
-   "self_type" : "type-826",
+   "referenced_type" : "type-590",
+   "self_type" : "type-589",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16741,8 +16712,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
    "name" : "int (*)(const gralloc_module_t *, int, ...)",
-   "referenced_type" : "type-823",
-   "self_type" : "type-822",
+   "referenced_type" : "type-586",
+   "self_type" : "type-585",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16750,8 +16721,8 @@
    "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-791",
-   "self_type" : "type-790",
+   "referenced_type" : "type-553",
+   "self_type" : "type-552",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16759,8 +16730,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *)",
    "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-810",
-   "self_type" : "type-809",
+   "referenced_type" : "type-573",
+   "self_type" : "type-572",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16768,8 +16739,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
    "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-808",
-   "self_type" : "type-807",
+   "referenced_type" : "type-571",
+   "self_type" : "type-570",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16777,8 +16748,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
    "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-803",
-   "self_type" : "type-802",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16786,8 +16757,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-806",
-   "self_type" : "type-805",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16795,8 +16766,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(hw_device_t *)",
    "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-799",
-   "self_type" : "type-798",
+   "referenced_type" : "type-561",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16814,7 +16785,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-103",
-   "self_type" : "type-830",
+   "self_type" : "type-593",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -16822,8 +16793,8 @@
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-1496",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1274",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -16832,7 +16803,7 @@
    "linker_set_key" : "long long *",
    "name" : "long long *",
    "referenced_type" : "type-284",
-   "self_type" : "type-1660",
+   "self_type" : "type-1432",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16841,7 +16812,7 @@
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
    "referenced_type" : "type-144",
-   "self_type" : "type-1364",
+   "self_type" : "type-1132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16876,8 +16847,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(alloc_device_t *, char *, int)",
    "name" : "void (*)(alloc_device_t *, char *, int)",
-   "referenced_type" : "type-844",
-   "self_type" : "type-843",
+   "referenced_type" : "type-608",
+   "self_type" : "type-607",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16894,8 +16865,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android_native_base_t *)",
    "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
+   "referenced_type" : "type-521",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16903,8 +16874,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
    "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-812",
-   "self_type" : "type-811",
+   "referenced_type" : "type-575",
+   "self_type" : "type-574",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16934,36 +16905,6 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1077",
-   "self_type" : "type-1079",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1119",
-   "self_type" : "type-1121",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1173",
-   "self_type" : "type-1175",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "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",
    "size" : 4,
@@ -16974,6 +16915,26 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1338",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1372",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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",
    "size" : 4,
@@ -16984,8 +16945,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1564",
-   "self_type" : "type-1566",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1574",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16994,8 +16955,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1598",
-   "self_type" : "type-1600",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1609",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17014,8 +16975,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1801",
-   "self_type" : "type-1803",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1766",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17024,8 +16985,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1836",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-1838",
+   "self_type" : "type-1840",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17034,8 +16995,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1993",
-   "self_type" : "type-1995",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17044,8 +17005,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2067",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2040",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17054,8 +17015,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17064,8 +17025,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17074,8 +17035,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2320",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2306",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17084,8 +17045,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17094,8 +17055,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2467",
-   "self_type" : "type-2466",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17104,8 +17065,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2633",
-   "self_type" : "type-2635",
+   "referenced_type" : "type-2541",
+   "self_type" : "type-2543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17114,8 +17075,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2661",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2578",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17124,8 +17085,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2701",
-   "self_type" : "type-2703",
+   "referenced_type" : "type-2751",
+   "self_type" : "type-2753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17134,8 +17095,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2736",
-   "self_type" : "type-2738",
+   "referenced_type" : "type-2798",
+   "self_type" : "type-2800",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17144,8 +17105,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2893",
-   "self_type" : "type-2895",
+   "referenced_type" : "type-2803",
+   "self_type" : "type-2805",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17154,8 +17115,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2967",
-   "self_type" : "type-2969",
+   "referenced_type" : "type-2813",
+   "self_type" : "type-2815",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17164,8 +17125,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3092",
-   "self_type" : "type-3094",
+   "referenced_type" : "type-2832",
+   "self_type" : "type-2834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17174,8 +17135,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3167",
-   "self_type" : "type-3169",
+   "referenced_type" : "type-2898",
+   "self_type" : "type-2900",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17184,8 +17145,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3220",
-   "self_type" : "type-3222",
+   "referenced_type" : "type-2983",
+   "self_type" : "type-2985",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17194,8 +17155,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3282",
-   "self_type" : "type-3284",
+   "referenced_type" : "type-3135",
+   "self_type" : "type-3137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17204,8 +17165,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3422",
-   "self_type" : "type-3421",
+   "referenced_type" : "type-3213",
+   "self_type" : "type-3215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17214,8 +17175,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3588",
-   "self_type" : "type-3590",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17224,8 +17185,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3614",
-   "self_type" : "type-3616",
+   "referenced_type" : "type-3306",
+   "self_type" : "type-3308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17234,8 +17195,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-430",
-   "self_type" : "type-432",
+   "referenced_type" : "type-3404",
+   "self_type" : "type-3403",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17244,8 +17205,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-492",
-   "self_type" : "type-495",
+   "referenced_type" : "type-3570",
+   "self_type" : "type-3572",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17254,8 +17215,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-503",
-   "self_type" : "type-507",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3598",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17264,8 +17225,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-528",
-   "self_type" : "type-530",
+   "referenced_type" : "type-407",
+   "self_type" : "type-409",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17274,8 +17235,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-562",
-   "self_type" : "type-564",
+   "referenced_type" : "type-513",
+   "self_type" : "type-515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17284,8 +17245,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-648",
-   "self_type" : "type-650",
+   "referenced_type" : "type-743",
+   "self_type" : "type-745",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17294,8 +17255,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-752",
-   "self_type" : "type-754",
+   "referenced_type" : "type-850",
+   "self_type" : "type-852",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17304,8 +17265,18 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-978",
-   "self_type" : "type-980",
+   "referenced_type" : "type-913",
+   "self_type" : "type-915",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-986",
+   "self_type" : "type-988",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17323,72 +17294,72 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1258",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1037",
    "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-2434",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2204",
    "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-3334",
-   "self_type" : "type-3333",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2249",
    "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-3381",
-   "self_type" : "type-3380",
+   "referenced_type" : "type-2741",
+   "self_type" : "type-2740",
    "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-418",
-   "self_type" : "type-417",
+   "referenced_type" : "type-3103",
+   "self_type" : "type-3102",
    "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-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-3369",
+   "self_type" : "type-3368",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-2112",
-   "self_type" : "type-2111",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1882",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-3012",
-   "self_type" : "type-3011",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3038",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-627",
+   "self_type" : "type-626",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -17396,8 +17367,8 @@
    "is_const" : true,
    "linker_set_key" : "const ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-756",
-   "self_type" : "type-878",
+   "referenced_type" : "type-517",
+   "self_type" : "type-637",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -17405,48 +17376,48 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1276",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2139",
    "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-2369",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2273",
    "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-3269",
-   "self_type" : "type-3268",
+   "referenced_type" : "type-2732",
+   "self_type" : "type-2731",
    "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-3396",
-   "self_type" : "type-3395",
+   "referenced_type" : "type-3016",
+   "self_type" : "type-3015",
    "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-409",
-   "self_type" : "type-408",
+   "referenced_type" : "type-3379",
+   "self_type" : "type-3378",
    "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-836",
-   "self_type" : "type-835",
+   "referenced_type" : "type-962",
+   "self_type" : "type-961",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -17454,28 +17425,18 @@
    "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-755",
-   "self_type" : "type-772",
+   "referenced_type" : "type-516",
+   "self_type" : "type-535",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CallStack",
-   "name" : "const android::CallStack",
-   "referenced_type" : "type-1231",
-   "self_type" : "type-1233",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::ColorSpace",
    "name" : "const android::ColorSpace",
-   "referenced_type" : "type-867",
-   "self_type" : "type-945",
+   "referenced_type" : "type-979",
+   "self_type" : "type-1039",
    "size" : 216,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -17484,8 +17445,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ColorSpace::TransferParameters",
    "name" : "const android::ColorSpace::TransferParameters",
-   "referenced_type" : "type-869",
-   "self_type" : "type-922",
+   "referenced_type" : "type-981",
+   "self_type" : "type-1033",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -17494,8 +17455,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ColorSpaceConnector",
    "name" : "const android::ColorSpaceConnector",
-   "referenced_type" : "type-963",
-   "self_type" : "type-973",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1045",
    "size" : 472,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -17504,8 +17465,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-1568",
-   "self_type" : "type-1567",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1339",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -17514,8 +17475,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime",
    "name" : "const android::FenceTime",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1395",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17524,8 +17485,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot",
    "name" : "const android::FenceTime::Snapshot",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1616",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1388",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17534,8 +17495,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1634",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17544,8 +17505,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::State",
    "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17554,8 +17515,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FloatRect",
    "name" : "const android::FloatRect",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1506",
+   "referenced_type" : "type-1275",
+   "self_type" : "type-1278",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
   },
@@ -17564,8 +17525,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FrameStats",
    "name" : "const android::FrameStats",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1656",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1428",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -17594,8 +17555,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-1876",
+   "self_type" : "type-1875",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17604,8 +17565,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-2010",
+   "self_type" : "type-2009",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17614,8 +17575,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2104",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2015",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17624,8 +17585,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2239",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-3029",
+   "self_type" : "type-3028",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17634,8 +17595,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-3195",
+   "self_type" : "type-3194",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17644,8 +17605,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3005",
-   "self_type" : "type-3004",
+   "referenced_type" : "type-3199",
+   "self_type" : "type-3198",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17654,8 +17615,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3139",
-   "self_type" : "type-3138",
+   "referenced_type" : "type-613",
+   "self_type" : "type-612",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17664,8 +17625,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3145",
-   "self_type" : "type-3144",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17674,8 +17635,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-849",
-   "self_type" : "type-848",
+   "referenced_type" : "type-828",
+   "self_type" : "type-827",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17684,8 +17645,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-764",
-   "self_type" : "type-860",
+   "referenced_type" : "type-525",
+   "self_type" : "type-624",
    "size" : 160,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -17694,8 +17655,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator",
    "name" : "const android::GraphicBufferAllocator",
-   "referenced_type" : "type-780",
-   "self_type" : "type-954",
+   "referenced_type" : "type-542",
+   "self_type" : "type-720",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -17704,8 +17665,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-912",
-   "self_type" : "type-940",
+   "referenced_type" : "type-676",
+   "self_type" : "type-706",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17714,8 +17675,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferMapper",
    "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-766",
-   "self_type" : "type-850",
+   "referenced_type" : "type-527",
+   "self_type" : "type-614",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17724,8 +17685,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::HdrCapabilities",
    "name" : "const android::HdrCapabilities",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-964",
+   "self_type" : "type-972",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -17734,8 +17695,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-949",
-   "self_type" : "type-951",
+   "referenced_type" : "type-715",
+   "self_type" : "type-717",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -17744,8 +17705,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1239",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-2231",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17754,8 +17715,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::Fence>",
    "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-1570",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1342",
+   "self_type" : "type-1355",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -17764,8 +17725,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1130",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
@@ -17774,8 +17735,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Point",
    "name" : "const android::Point",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1510",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1282",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
   },
@@ -17784,8 +17745,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1222",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
@@ -17795,7 +17756,7 @@
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-172",
-   "self_type" : "type-1310",
+   "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17804,8 +17765,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1242",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2220",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -17814,8 +17775,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-944",
-   "self_type" : "type-947",
+   "referenced_type" : "type-711",
+   "self_type" : "type-713",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17835,7 +17796,7 @@
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
    "referenced_type" : "type-285",
-   "self_type" : "type-681",
+   "self_type" : "type-873",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17844,18 +17805,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1227",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::String8>",
-   "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-1217",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2215",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17864,8 +17815,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long long>",
    "name" : "const android::Vector<long long>",
-   "referenced_type" : "type-1649",
-   "self_type" : "type-1653",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1425",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17875,7 +17826,7 @@
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
    "referenced_type" : "type-235",
-   "self_type" : "type-1650",
+   "self_type" : "type-1422",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -17884,8 +17835,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser>",
-   "referenced_type" : "type-1569",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1366",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17894,8 +17845,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat33<float>",
    "name" : "const android::details::TMat33<float>",
-   "referenced_type" : "type-718",
-   "self_type" : "type-775",
+   "referenced_type" : "type-903",
+   "self_type" : "type-925",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -17904,8 +17855,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2280",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -17915,7 +17866,7 @@
    "linker_set_key" : "const android::details::TQuaternion<double>",
    "name" : "const android::details::TQuaternion<double>",
    "referenced_type" : "type-331",
-   "self_type" : "type-395",
+   "self_type" : "type-404",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -17924,8 +17875,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<float>",
    "name" : "const android::details::TQuaternion<float>",
-   "referenced_type" : "type-400",
-   "self_type" : "type-429",
+   "referenced_type" : "type-410",
+   "self_type" : "type-432",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -17934,8 +17885,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<bool>",
    "name" : "const android::details::TVec2<bool>",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1493",
+   "referenced_type" : "type-1266",
+   "self_type" : "type-1265",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -17945,7 +17896,7 @@
    "linker_set_key" : "const android::details::TVec2<double>",
    "name" : "const android::details::TVec2<double>",
    "referenced_type" : "type-55",
-   "self_type" : "type-1302",
+   "self_type" : "type-1070",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -17955,7 +17906,7 @@
    "linker_set_key" : "const android::details::TVec2<float>",
    "name" : "const android::details::TVec2<float>",
    "referenced_type" : "type-22",
-   "self_type" : "type-987",
+   "self_type" : "type-1051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -17965,7 +17916,7 @@
    "linker_set_key" : "const android::details::TVec3<double>",
    "name" : "const android::details::TVec3<double>",
    "referenced_type" : "type-66",
-   "self_type" : "type-1597",
+   "self_type" : "type-1369",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -17975,7 +17926,7 @@
    "linker_set_key" : "const android::details::TVec3<float>",
    "name" : "const android::details::TVec3<float>",
    "referenced_type" : "type-17",
-   "self_type" : "type-991",
+   "self_type" : "type-1055",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -18015,7 +17966,7 @@
    "linker_set_key" : "const android::half::fp16",
    "name" : "const android::half::fp16",
    "referenced_type" : "type-2",
-   "self_type" : "type-1011",
+   "self_type" : "type-1059",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -18024,8 +17975,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::half::fp32",
    "name" : "const android::half::fp32",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1236",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -18064,8 +18015,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-635",
-   "self_type" : "type-642",
+   "referenced_type" : "type-393",
+   "self_type" : "type-401",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18085,7 +18036,7 @@
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
    "referenced_type" : "type-102",
-   "self_type" : "type-1538",
+   "self_type" : "type-1310",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18094,8 +18045,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10>",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10>",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18125,7 +18076,7 @@
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
    "referenced_type" : "type-101",
-   "self_type" : "type-1547",
+   "self_type" : "type-1319",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18134,8 +18085,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-1974",
-   "self_type" : "type-1973",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1744",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18144,8 +18095,18 @@
    "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-2874",
-   "self_type" : "type-2873",
+   "referenced_type" : "type-2714",
+   "self_type" : "type-2713",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
+   "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
+   "referenced_type" : "type-2880",
+   "self_type" : "type-2879",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18162,10 +18123,10 @@
   {
    "alignment" : 4,
    "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-626",
-   "self_type" : "type-625",
+   "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
+   "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1827",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18174,8 +18135,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-2057",
-   "self_type" : "type-2056",
+   "referenced_type" : "type-2973",
+   "self_type" : "type-2972",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18184,18 +18145,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-2957",
-   "self_type" : "type-2956",
-   "size" : 12,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "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-738",
-   "self_type" : "type-737",
+   "referenced_type" : "type-495",
+   "self_type" : "type-494",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18214,8 +18165,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_0::ColorMode",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1149",
    "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"
   },
@@ -18224,8 +18175,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::ColorTransform",
    "name" : "const android::hardware::graphics::common::V1_0::ColorTransform",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1152",
    "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"
   },
@@ -18234,8 +18185,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_0::Dataspace",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-1139",
+   "self_type" : "type-1148",
    "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"
   },
@@ -18244,8 +18195,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Hdr",
    "name" : "const android::hardware::graphics::common::V1_0::Hdr",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1153",
    "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"
   },
@@ -18254,8 +18205,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_0::PixelFormat",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1137",
+   "self_type" : "type-1144",
    "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"
   },
@@ -18264,8 +18215,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Transform",
    "name" : "const android::hardware::graphics::common::V1_0::Transform",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1147",
    "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"
   },
@@ -18284,8 +18235,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_1::ColorMode",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1170",
+   "self_type" : "type-1174",
    "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"
   },
@@ -18294,8 +18245,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_1::Dataspace",
-   "referenced_type" : "type-1401",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1173",
    "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"
   },
@@ -18304,8 +18255,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_1::PixelFormat",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1404",
+   "referenced_type" : "type-1168",
+   "self_type" : "type-1172",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -18314,8 +18265,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::RenderIntent",
    "name" : "const android::hardware::graphics::common::V1_1::RenderIntent",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1171",
+   "self_type" : "type-1175",
    "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"
   },
@@ -18324,8 +18275,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-658",
-   "self_type" : "type-660",
+   "referenced_type" : "type-420",
+   "self_type" : "type-422",
    "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"
   },
@@ -18334,8 +18285,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_2::ColorMode",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1192",
+   "self_type" : "type-1197",
    "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"
   },
@@ -18344,8 +18295,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_2::Dataspace",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1196",
    "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"
   },
@@ -18354,8 +18305,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::Hdr",
    "name" : "const android::hardware::graphics::common::V1_2::Hdr",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1190",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -18364,8 +18315,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_2::PixelFormat",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1194",
+   "self_type" : "type-1198",
    "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"
   },
@@ -18374,8 +18325,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-1814",
-   "self_type" : "type-1813",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18384,8 +18335,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-2714",
-   "self_type" : "type-2713",
+   "referenced_type" : "type-2554",
+   "self_type" : "type-2553",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18394,8 +18345,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-550",
-   "self_type" : "type-549",
+   "referenced_type" : "type-2826",
+   "self_type" : "type-2825",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18414,8 +18365,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-1824",
-   "self_type" : "type-1823",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1594",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18424,8 +18375,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-2724",
-   "self_type" : "type-2723",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2563",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18434,8 +18385,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-556",
-   "self_type" : "type-555",
+   "referenced_type" : "type-2830",
+   "self_type" : "type-2829",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18454,8 +18405,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-1983",
-   "self_type" : "type-1982",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18464,8 +18415,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-2883",
-   "self_type" : "type-2882",
+   "referenced_type" : "type-2888",
+   "self_type" : "type-2887",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18474,8 +18425,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-634",
-   "self_type" : "type-633",
+   "referenced_type" : "type-392",
+   "self_type" : "type-391",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18484,8 +18435,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10>",
    "name" : "const android::hardware::hidl_array<unsigned int, 10>",
-   "referenced_type" : "type-1340",
-   "self_type" : "type-1343",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1111",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18514,8 +18465,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-657",
-   "self_type" : "type-661",
+   "referenced_type" : "type-419",
+   "self_type" : "type-423",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18525,7 +18476,7 @@
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
    "referenced_type" : "type-139",
-   "self_type" : "type-1353",
+   "self_type" : "type-1121",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18534,8 +18485,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1088",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18544,8 +18495,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1314",
-   "self_type" : "type-1315",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1083",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18574,8 +18525,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1115",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18614,8 +18565,8 @@
    "is_const" : true,
    "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-930",
-   "self_type" : "type-929",
+   "referenced_type" : "type-694",
+   "self_type" : "type-693",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18624,8 +18575,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18664,8 +18615,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-728",
-   "self_type" : "type-735",
+   "referenced_type" : "type-484",
+   "self_type" : "type-492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18694,8 +18645,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-740",
-   "self_type" : "type-747",
+   "referenced_type" : "type-497",
+   "self_type" : "type-505",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18704,8 +18655,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-1357",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18734,8 +18685,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Size",
    "name" : "const android::ui::Size",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1290",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
   },
@@ -18744,8 +18695,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-1286",
-   "self_type" : "type-1289",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2286",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -18754,8 +18705,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1297",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2295",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -18795,7 +18746,7 @@
    "linker_set_key" : "const double",
    "name" : "const double",
    "referenced_type" : "type-41",
-   "self_type" : "type-666",
+   "self_type" : "type-853",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18805,7 +18756,7 @@
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-10",
-   "self_type" : "type-800",
+   "self_type" : "type-563",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -18813,48 +18764,48 @@
    "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-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1061",
    "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-1265",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2256",
    "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-2455",
-   "self_type" : "type-2454",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
    "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-3384",
-   "self_type" : "type-3383",
+   "referenced_type" : "type-2744",
+   "self_type" : "type-2743",
    "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-3387",
-   "self_type" : "type-3386",
+   "referenced_type" : "type-3179",
+   "self_type" : "type-3178",
    "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-422",
-   "self_type" : "type-421",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -18862,8 +18813,8 @@
    "is_const" : true,
    "linker_set_key" : "const gralloc_module_t",
    "name" : "const gralloc_module_t",
-   "referenced_type" : "type-815",
-   "self_type" : "type-819",
+   "referenced_type" : "type-578",
+   "self_type" : "type-582",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -18872,8 +18823,8 @@
    "is_const" : true,
    "linker_set_key" : "const hw_module_t",
    "name" : "const hw_module_t",
-   "referenced_type" : "type-787",
-   "self_type" : "type-793",
+   "referenced_type" : "type-549",
+   "self_type" : "type-555",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -18883,7 +18834,7 @@
    "linker_set_key" : "const int",
    "name" : "const int",
    "referenced_type" : "type-103",
-   "self_type" : "type-647",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -18891,24 +18842,8 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1081",
-   "self_type" : "type-1080",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const iter<is_const>",
-   "name" : "const iter<is_const>",
-   "referenced_type" : "type-1123",
-   "self_type" : "type-1122",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const iter<is_const>",
-   "name" : "const iter<is_const>",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1094",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18923,152 +18858,168 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1327",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1576",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1806",
-   "self_type" : "type-1805",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1840",
+   "referenced_type" : "type-1768",
+   "self_type" : "type-1767",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1997",
-   "self_type" : "type-1996",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1892",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2122",
-   "self_type" : "type-2121",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1966",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2042",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2094",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2156",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2386",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2322",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2483",
-   "self_type" : "type-2482",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2545",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2706",
-   "self_type" : "type-2705",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2741",
-   "self_type" : "type-2740",
+   "referenced_type" : "type-2756",
+   "self_type" : "type-2755",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2897",
-   "self_type" : "type-2896",
+   "referenced_type" : "type-2817",
+   "self_type" : "type-2816",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3022",
-   "self_type" : "type-3021",
+   "referenced_type" : "type-2836",
+   "self_type" : "type-2835",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3096",
-   "self_type" : "type-3095",
+   "referenced_type" : "type-2903",
+   "self_type" : "type-2902",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3172",
-   "self_type" : "type-3171",
+   "referenced_type" : "type-3049",
+   "self_type" : "type-3048",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3224",
-   "self_type" : "type-3223",
+   "referenced_type" : "type-3140",
+   "self_type" : "type-3139",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3286",
-   "self_type" : "type-3285",
+   "referenced_type" : "type-3217",
+   "self_type" : "type-3216",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3438",
-   "self_type" : "type-3437",
+   "referenced_type" : "type-3259",
+   "self_type" : "type-3258",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3309",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3420",
+   "self_type" : "type-3419",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19083,48 +19034,48 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-417",
+   "self_type" : "type-416",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-533",
-   "self_type" : "type-532",
+   "referenced_type" : "type-641",
+   "self_type" : "type-640",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-567",
-   "self_type" : "type-566",
+   "referenced_type" : "type-748",
+   "self_type" : "type-747",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-653",
-   "self_type" : "type-652",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-881",
-   "self_type" : "type-880",
+   "referenced_type" : "type-917",
+   "self_type" : "type-916",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-983",
-   "self_type" : "type-982",
+   "referenced_type" : "type-990",
+   "self_type" : "type-989",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19132,8 +19083,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-1496",
-   "self_type" : "type-1499",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1271",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -19143,7 +19094,7 @@
    "linker_set_key" : "const long long",
    "name" : "const long long",
    "referenced_type" : "type-284",
-   "self_type" : "type-655",
+   "self_type" : "type-847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19163,7 +19114,7 @@
    "linker_set_key" : "const native_handle *const",
    "name" : "const native_handle *const",
    "referenced_type" : "type-142",
-   "self_type" : "type-932",
+   "self_type" : "type-696",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19172,8 +19123,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-506",
-   "self_type" : "type-631",
+   "referenced_type" : "type-599",
+   "self_type" : "type-825",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19182,8 +19133,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-619",
-   "self_type" : "type-618",
+   "referenced_type" : "type-800",
+   "self_type" : "type-799",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19192,8 +19143,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-2431",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-1035",
+   "self_type" : "type-1034",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19202,8 +19153,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-3331",
-   "self_type" : "type-3330",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19212,8 +19163,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-415",
-   "self_type" : "type-414",
+   "referenced_type" : "type-2738",
+   "self_type" : "type-2737",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19222,8 +19173,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-928",
-   "self_type" : "type-927",
+   "referenced_type" : "type-3091",
+   "self_type" : "type-3090",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19232,8 +19183,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-1088",
-   "self_type" : "type-1087",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1156",
    "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"
   },
@@ -19242,8 +19193,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-1128",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1686",
    "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"
   },
@@ -19252,8 +19203,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-1182",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-1786",
+   "self_type" : "type-1785",
    "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"
   },
@@ -19262,8 +19213,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-1389",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1900",
+   "self_type" : "type-1899",
    "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"
   },
@@ -19272,8 +19223,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-1916",
-   "self_type" : "type-1915",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
    "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"
   },
@@ -19282,8 +19233,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-2015",
-   "self_type" : "type-2014",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2053",
    "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"
   },
@@ -19292,8 +19243,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-2129",
-   "self_type" : "type-2128",
+   "referenced_type" : "type-2100",
+   "self_type" : "type-2099",
    "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"
   },
@@ -19302,8 +19253,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-2203",
-   "self_type" : "type-2202",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2161",
    "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"
   },
@@ -19312,8 +19263,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-2283",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2360",
    "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"
   },
@@ -19322,8 +19273,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-2329",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2655",
    "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"
   },
@@ -19332,8 +19283,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-2391",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2762",
+   "self_type" : "type-2761",
    "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"
   },
@@ -19342,8 +19293,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-2521",
-   "self_type" : "type-2520",
+   "referenced_type" : "type-2849",
+   "self_type" : "type-2848",
    "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"
   },
@@ -19352,28 +19303,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-2816",
-   "self_type" : "type-2815",
-   "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"
-  },
-  {
-   "alignment" : 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-2915",
-   "self_type" : "type-2914",
-   "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"
-  },
-  {
-   "alignment" : 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-3029",
-   "self_type" : "type-3028",
+   "referenced_type" : "type-2925",
+   "self_type" : "type-2924",
    "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"
   },
@@ -19392,8 +19323,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-3103",
-   "self_type" : "type-3102",
+   "referenced_type" : "type-3056",
+   "self_type" : "type-3055",
    "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"
   },
@@ -19402,8 +19333,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-3183",
-   "self_type" : "type-3182",
+   "referenced_type" : "type-3154",
+   "self_type" : "type-3153",
    "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"
   },
@@ -19412,8 +19343,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-3229",
-   "self_type" : "type-3228",
+   "referenced_type" : "type-3224",
+   "self_type" : "type-3223",
    "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"
   },
@@ -19422,8 +19353,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-3291",
-   "self_type" : "type-3290",
+   "referenced_type" : "type-3264",
+   "self_type" : "type-3263",
    "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"
   },
@@ -19432,8 +19363,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-3476",
-   "self_type" : "type-3475",
+   "referenced_type" : "type-3315",
+   "self_type" : "type-3314",
    "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"
   },
@@ -19442,8 +19373,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-443",
-   "self_type" : "type-442",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3457",
    "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"
   },
@@ -19452,8 +19383,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-590",
-   "self_type" : "type-589",
+   "referenced_type" : "type-442",
+   "self_type" : "type-441",
    "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"
   },
@@ -19462,8 +19393,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-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-652",
+   "self_type" : "type-651",
    "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"
   },
@@ -19472,8 +19403,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-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-762",
+   "self_type" : "type-761",
    "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"
   },
@@ -19482,8 +19413,28 @@
    "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-999",
-   "self_type" : "type-998",
+   "referenced_type" : "type-866",
+   "self_type" : "type-865",
+   "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"
+  },
+  {
+   "alignment" : 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",
+   "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"
+  },
+  {
+   "alignment" : 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-995",
+   "self_type" : "type-994",
    "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"
   },
@@ -19492,8 +19443,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-1006",
-   "self_type" : "type-1005",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1000",
    "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"
   },
@@ -19502,8 +19453,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-1094",
-   "self_type" : "type-1093",
+   "referenced_type" : "type-1163",
+   "self_type" : "type-1162",
    "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"
   },
@@ -19512,8 +19463,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-1134",
-   "self_type" : "type-1133",
+   "referenced_type" : "type-1693",
+   "self_type" : "type-1692",
    "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"
   },
@@ -19522,8 +19473,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-1188",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1791",
    "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"
   },
@@ -19532,8 +19483,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-1395",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1905",
    "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"
   },
@@ -19542,8 +19493,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-1922",
-   "self_type" : "type-1921",
+   "referenced_type" : "type-1982",
+   "self_type" : "type-1981",
    "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"
   },
@@ -19552,8 +19503,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-2021",
-   "self_type" : "type-2020",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2059",
    "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"
   },
@@ -19562,8 +19513,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-2135",
-   "self_type" : "type-2134",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2106",
    "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"
   },
@@ -19572,8 +19523,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-2211",
-   "self_type" : "type-2210",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2167",
    "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"
   },
@@ -19582,8 +19533,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-2289",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "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"
   },
@@ -19592,8 +19543,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-2336",
-   "self_type" : "type-2335",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2661",
    "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"
   },
@@ -19602,8 +19553,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-2397",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2768",
+   "self_type" : "type-2767",
    "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"
   },
@@ -19612,8 +19563,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-2527",
-   "self_type" : "type-2526",
+   "referenced_type" : "type-2855",
+   "self_type" : "type-2854",
    "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"
   },
@@ -19622,8 +19573,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-2822",
-   "self_type" : "type-2821",
+   "referenced_type" : "type-2932",
+   "self_type" : "type-2931",
    "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"
   },
@@ -19632,18 +19583,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-2921",
-   "self_type" : "type-2920",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3035",
-   "self_type" : "type-3034",
+   "referenced_type" : "type-3062",
+   "self_type" : "type-3061",
    "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"
   },
@@ -19662,8 +19603,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-3111",
-   "self_type" : "type-3110",
+   "referenced_type" : "type-3161",
+   "self_type" : "type-3160",
    "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"
   },
@@ -19672,8 +19613,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-3189",
-   "self_type" : "type-3188",
+   "referenced_type" : "type-3230",
+   "self_type" : "type-3229",
    "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"
   },
@@ -19682,8 +19623,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-3236",
-   "self_type" : "type-3235",
+   "referenced_type" : "type-3270",
+   "self_type" : "type-3269",
    "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"
   },
@@ -19692,8 +19633,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-3297",
-   "self_type" : "type-3296",
+   "referenced_type" : "type-3321",
+   "self_type" : "type-3320",
    "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"
   },
@@ -19702,8 +19643,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-3482",
-   "self_type" : "type-3481",
+   "referenced_type" : "type-3464",
+   "self_type" : "type-3463",
    "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"
   },
@@ -19712,8 +19653,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-448",
+   "self_type" : "type-447",
    "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"
   },
@@ -19722,8 +19663,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-596",
-   "self_type" : "type-595",
+   "referenced_type" : "type-658",
+   "self_type" : "type-657",
    "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"
   },
@@ -19732,8 +19673,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-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-770",
+   "self_type" : "type-769",
    "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"
   },
@@ -19742,8 +19683,18 @@
    "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-894",
-   "self_type" : "type-893",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
    "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"
   },
@@ -19752,8 +19703,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-1008",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1002",
    "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"
   },
@@ -19762,8 +19713,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-1096",
-   "self_type" : "type-1095",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1164",
    "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"
   },
@@ -19772,8 +19723,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-1136",
-   "self_type" : "type-1135",
+   "referenced_type" : "type-1695",
+   "self_type" : "type-1694",
    "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"
   },
@@ -19782,8 +19733,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-1190",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1793",
    "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"
   },
@@ -19792,8 +19743,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-1397",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1907",
    "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"
   },
@@ -19802,8 +19753,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-1924",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1984",
+   "self_type" : "type-1983",
    "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"
   },
@@ -19812,8 +19763,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-2023",
-   "self_type" : "type-2022",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
    "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"
   },
@@ -19822,8 +19773,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-2137",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2108",
    "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"
   },
@@ -19832,8 +19783,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-2213",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2169",
    "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"
   },
@@ -19842,8 +19793,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-2292",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "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"
   },
@@ -19852,8 +19803,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-2338",
-   "self_type" : "type-2337",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2663",
    "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"
   },
@@ -19862,8 +19813,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-2399",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2770",
+   "self_type" : "type-2769",
    "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"
   },
@@ -19872,8 +19823,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-2529",
-   "self_type" : "type-2528",
+   "referenced_type" : "type-2857",
+   "self_type" : "type-2856",
    "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"
   },
@@ -19882,8 +19833,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-2824",
-   "self_type" : "type-2823",
+   "referenced_type" : "type-2934",
+   "self_type" : "type-2933",
    "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"
   },
@@ -19892,28 +19843,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-2923",
-   "self_type" : "type-2922",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3037",
-   "self_type" : "type-3036",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3113",
-   "self_type" : "type-3112",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3063",
    "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"
   },
@@ -19932,8 +19863,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-3192",
-   "self_type" : "type-3191",
+   "referenced_type" : "type-3163",
+   "self_type" : "type-3162",
    "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"
   },
@@ -19942,8 +19873,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-3238",
-   "self_type" : "type-3237",
+   "referenced_type" : "type-3232",
+   "self_type" : "type-3231",
    "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"
   },
@@ -19952,8 +19883,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-3299",
-   "self_type" : "type-3298",
+   "referenced_type" : "type-3272",
+   "self_type" : "type-3271",
    "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"
   },
@@ -19962,8 +19893,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-3484",
-   "self_type" : "type-3483",
+   "referenced_type" : "type-3323",
+   "self_type" : "type-3322",
    "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"
   },
@@ -19972,8 +19903,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3465",
    "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"
   },
@@ -19982,8 +19913,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-598",
-   "self_type" : "type-597",
+   "referenced_type" : "type-450",
+   "self_type" : "type-449",
    "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"
   },
@@ -19992,8 +19923,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-687",
-   "self_type" : "type-686",
+   "referenced_type" : "type-660",
+   "self_type" : "type-659",
    "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"
   },
@@ -20002,8 +19933,28 @@
    "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-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-772",
+   "self_type" : "type-771",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
    "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"
   },
@@ -20012,8 +19963,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-1003",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1160",
    "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"
   },
@@ -20022,8 +19973,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-1092",
-   "self_type" : "type-1091",
+   "referenced_type" : "type-1691",
+   "self_type" : "type-1690",
    "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"
   },
@@ -20032,8 +19983,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-1132",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1790",
+   "self_type" : "type-1789",
    "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"
   },
@@ -20042,8 +19993,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-1186",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "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"
   },
@@ -20052,8 +20003,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-1393",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1977",
    "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"
   },
@@ -20062,8 +20013,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-1920",
-   "self_type" : "type-1919",
+   "referenced_type" : "type-2058",
+   "self_type" : "type-2057",
    "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"
   },
@@ -20072,8 +20023,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-2019",
-   "self_type" : "type-2018",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
    "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"
   },
@@ -20082,8 +20033,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-2133",
-   "self_type" : "type-2132",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2165",
    "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"
   },
@@ -20092,8 +20043,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-2207",
-   "self_type" : "type-2206",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "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"
   },
@@ -20102,8 +20053,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-2287",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2659",
    "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"
   },
@@ -20112,8 +20063,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-2334",
-   "self_type" : "type-2333",
+   "referenced_type" : "type-2766",
+   "self_type" : "type-2765",
    "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"
   },
@@ -20122,8 +20073,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-2395",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2853",
+   "self_type" : "type-2852",
    "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"
   },
@@ -20132,8 +20083,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-2525",
-   "self_type" : "type-2524",
+   "referenced_type" : "type-2930",
+   "self_type" : "type-2929",
    "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"
   },
@@ -20142,28 +20093,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-2820",
-   "self_type" : "type-2819",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2919",
-   "self_type" : "type-2918",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3033",
-   "self_type" : "type-3032",
+   "referenced_type" : "type-3060",
+   "self_type" : "type-3059",
    "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"
   },
@@ -20182,8 +20113,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-3107",
-   "self_type" : "type-3106",
+   "referenced_type" : "type-3158",
+   "self_type" : "type-3157",
    "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"
   },
@@ -20192,8 +20123,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-3187",
-   "self_type" : "type-3186",
+   "referenced_type" : "type-3228",
+   "self_type" : "type-3227",
    "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"
   },
@@ -20202,8 +20133,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-3234",
-   "self_type" : "type-3233",
+   "referenced_type" : "type-3268",
+   "self_type" : "type-3267",
    "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"
   },
@@ -20212,8 +20143,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-3295",
-   "self_type" : "type-3294",
+   "referenced_type" : "type-3319",
+   "self_type" : "type-3318",
    "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"
   },
@@ -20222,8 +20153,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-3480",
-   "self_type" : "type-3479",
+   "referenced_type" : "type-3462",
+   "self_type" : "type-3461",
    "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"
   },
@@ -20232,8 +20163,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "type-446",
+   "self_type" : "type-445",
    "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"
   },
@@ -20242,8 +20173,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-594",
-   "self_type" : "type-593",
+   "referenced_type" : "type-656",
+   "self_type" : "type-655",
    "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"
   },
@@ -20252,8 +20183,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-683",
-   "self_type" : "type-682",
+   "referenced_type" : "type-766",
+   "self_type" : "type-765",
    "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"
   },
@@ -20262,8 +20193,28 @@
    "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-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-870",
+   "self_type" : "type-869",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-999",
+   "self_type" : "type-998",
    "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"
   },
@@ -20272,8 +20223,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-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
    "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"
   },
@@ -20282,8 +20233,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-1098",
-   "self_type" : "type-1097",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1166",
    "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"
   },
@@ -20292,8 +20243,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-1138",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-1697",
+   "self_type" : "type-1696",
    "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"
   },
@@ -20302,8 +20253,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-1192",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1795",
    "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"
   },
@@ -20312,8 +20263,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-1399",
-   "self_type" : "type-1398",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "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"
   },
@@ -20322,8 +20273,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-1926",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "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"
   },
@@ -20332,8 +20283,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-2025",
-   "self_type" : "type-2024",
+   "referenced_type" : "type-2065",
+   "self_type" : "type-2064",
    "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"
   },
@@ -20342,8 +20293,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-2139",
-   "self_type" : "type-2138",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2110",
    "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"
   },
@@ -20352,8 +20303,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-2215",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2171",
    "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"
   },
@@ -20362,8 +20313,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-2294",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "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"
   },
@@ -20372,8 +20323,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-2340",
-   "self_type" : "type-2339",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2665",
    "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"
   },
@@ -20382,8 +20333,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-2401",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2772",
+   "self_type" : "type-2771",
    "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"
   },
@@ -20392,8 +20343,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-2531",
-   "self_type" : "type-2530",
+   "referenced_type" : "type-2859",
+   "self_type" : "type-2858",
    "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"
   },
@@ -20402,8 +20353,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-2826",
-   "self_type" : "type-2825",
+   "referenced_type" : "type-2936",
+   "self_type" : "type-2935",
    "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"
   },
@@ -20412,28 +20363,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-2925",
-   "self_type" : "type-2924",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3039",
-   "self_type" : "type-3038",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3115",
-   "self_type" : "type-3114",
+   "referenced_type" : "type-3067",
+   "self_type" : "type-3066",
    "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"
   },
@@ -20452,8 +20383,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-3194",
-   "self_type" : "type-3193",
+   "referenced_type" : "type-3165",
+   "self_type" : "type-3164",
    "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"
   },
@@ -20462,8 +20393,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-3240",
-   "self_type" : "type-3239",
+   "referenced_type" : "type-3234",
+   "self_type" : "type-3233",
    "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"
   },
@@ -20472,8 +20403,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-3301",
-   "self_type" : "type-3300",
+   "referenced_type" : "type-3274",
+   "self_type" : "type-3273",
    "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"
   },
@@ -20482,8 +20413,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-3486",
-   "self_type" : "type-3485",
+   "referenced_type" : "type-3325",
+   "self_type" : "type-3324",
    "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"
   },
@@ -20492,8 +20423,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-453",
+   "referenced_type" : "type-3468",
+   "self_type" : "type-3467",
    "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"
   },
@@ -20502,8 +20433,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-600",
-   "self_type" : "type-599",
+   "referenced_type" : "type-452",
+   "self_type" : "type-451",
    "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"
   },
@@ -20512,8 +20443,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-689",
-   "self_type" : "type-688",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
    "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"
   },
@@ -20522,8 +20453,28 @@
    "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-899",
-   "self_type" : "type-898",
+   "referenced_type" : "type-774",
+   "self_type" : "type-773",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
    "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"
   },
@@ -20532,8 +20483,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-1086",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1154",
    "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"
   },
@@ -20542,8 +20493,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-1126",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-1685",
+   "self_type" : "type-1684",
    "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"
   },
@@ -20552,8 +20503,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-1180",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-1784",
+   "self_type" : "type-1783",
    "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"
   },
@@ -20562,8 +20513,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-1387",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1898",
+   "self_type" : "type-1897",
    "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"
   },
@@ -20572,8 +20523,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-1914",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1971",
    "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"
   },
@@ -20582,8 +20533,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-2013",
-   "self_type" : "type-2012",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
    "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"
   },
@@ -20592,8 +20543,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-2127",
-   "self_type" : "type-2126",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2097",
    "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"
   },
@@ -20602,8 +20553,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-2201",
-   "self_type" : "type-2200",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2159",
    "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"
   },
@@ -20612,8 +20563,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-2281",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2358",
    "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"
   },
@@ -20622,8 +20573,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-2327",
-   "self_type" : "type-2326",
+   "referenced_type" : "type-2654",
+   "self_type" : "type-2653",
    "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"
   },
@@ -20632,8 +20583,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-2389",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2760",
+   "self_type" : "type-2759",
    "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"
   },
@@ -20642,8 +20593,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-2519",
-   "self_type" : "type-2518",
+   "referenced_type" : "type-2847",
+   "self_type" : "type-2846",
    "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"
   },
@@ -20652,18 +20603,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-2814",
-   "self_type" : "type-2813",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2913",
-   "self_type" : "type-2912",
+   "referenced_type" : "type-2923",
+   "self_type" : "type-2922",
    "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"
   },
@@ -20682,8 +20623,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-3027",
-   "self_type" : "type-3026",
+   "referenced_type" : "type-3054",
+   "self_type" : "type-3053",
    "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"
   },
@@ -20692,8 +20633,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-3101",
-   "self_type" : "type-3100",
+   "referenced_type" : "type-3152",
+   "self_type" : "type-3151",
    "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"
   },
@@ -20702,8 +20643,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-3181",
-   "self_type" : "type-3180",
+   "referenced_type" : "type-3222",
+   "self_type" : "type-3221",
    "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"
   },
@@ -20712,8 +20653,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-3227",
-   "self_type" : "type-3226",
+   "referenced_type" : "type-3262",
+   "self_type" : "type-3261",
    "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"
   },
@@ -20722,8 +20663,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-3289",
-   "self_type" : "type-3288",
+   "referenced_type" : "type-3313",
+   "self_type" : "type-3312",
    "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"
   },
@@ -20732,8 +20673,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-3474",
-   "self_type" : "type-3473",
+   "referenced_type" : "type-3456",
+   "self_type" : "type-3455",
    "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"
   },
@@ -20742,8 +20683,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-441",
-   "self_type" : "type-440",
+   "referenced_type" : "type-440",
+   "self_type" : "type-439",
    "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"
   },
@@ -20752,8 +20693,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-588",
-   "self_type" : "type-587",
+   "referenced_type" : "type-649",
+   "self_type" : "type-648",
    "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"
   },
@@ -20762,8 +20703,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-676",
-   "self_type" : "type-675",
+   "referenced_type" : "type-760",
+   "self_type" : "type-759",
    "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"
   },
@@ -20772,8 +20713,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-886",
-   "self_type" : "type-885",
+   "referenced_type" : "type-863",
+   "self_type" : "type-862",
    "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"
   },
@@ -20782,8 +20723,18 @@
    "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-997",
-   "self_type" : "type-996",
+   "referenced_type" : "type-920",
+   "self_type" : "type-919",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-993",
+   "self_type" : "type-992",
    "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"
   },
@@ -20792,8 +20743,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-1001",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1158",
    "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"
   },
@@ -20802,8 +20753,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-1090",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-1689",
+   "self_type" : "type-1688",
    "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"
   },
@@ -20812,8 +20763,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-1130",
-   "self_type" : "type-1129",
+   "referenced_type" : "type-1788",
+   "self_type" : "type-1787",
    "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"
   },
@@ -20822,8 +20773,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-1184",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1901",
    "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"
   },
@@ -20832,8 +20783,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-1391",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
    "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"
   },
@@ -20842,8 +20793,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-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-2056",
+   "self_type" : "type-2055",
    "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"
   },
@@ -20852,8 +20803,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-2017",
-   "self_type" : "type-2016",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2101",
    "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"
   },
@@ -20862,8 +20813,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-2131",
-   "self_type" : "type-2130",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2163",
    "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"
   },
@@ -20872,8 +20823,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-2205",
-   "self_type" : "type-2204",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
    "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"
   },
@@ -20882,8 +20833,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-2285",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2657",
    "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"
   },
@@ -20892,8 +20843,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-2331",
-   "self_type" : "type-2330",
+   "referenced_type" : "type-2764",
+   "self_type" : "type-2763",
    "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"
   },
@@ -20902,8 +20853,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-2393",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2851",
+   "self_type" : "type-2850",
    "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"
   },
@@ -20912,38 +20863,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-2523",
-   "self_type" : "type-2522",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2818",
-   "self_type" : "type-2817",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2917",
-   "self_type" : "type-2916",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3031",
-   "self_type" : "type-3030",
+   "referenced_type" : "type-2927",
+   "self_type" : "type-2926",
    "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"
   },
@@ -20962,8 +20883,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-3105",
-   "self_type" : "type-3104",
+   "referenced_type" : "type-3058",
+   "self_type" : "type-3057",
    "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"
   },
@@ -20972,8 +20893,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-3185",
-   "self_type" : "type-3184",
+   "referenced_type" : "type-3156",
+   "self_type" : "type-3155",
    "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"
   },
@@ -20982,8 +20903,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-3231",
-   "self_type" : "type-3230",
+   "referenced_type" : "type-3226",
+   "self_type" : "type-3225",
    "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"
   },
@@ -20992,8 +20913,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-3293",
-   "self_type" : "type-3292",
+   "referenced_type" : "type-3266",
+   "self_type" : "type-3265",
    "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"
   },
@@ -21002,8 +20923,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-3478",
-   "self_type" : "type-3477",
+   "referenced_type" : "type-3317",
+   "self_type" : "type-3316",
    "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"
   },
@@ -21012,8 +20933,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-445",
-   "self_type" : "type-444",
+   "referenced_type" : "type-3460",
+   "self_type" : "type-3459",
    "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"
   },
@@ -21022,8 +20943,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-592",
-   "self_type" : "type-591",
+   "referenced_type" : "type-444",
+   "self_type" : "type-443",
    "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"
   },
@@ -21032,8 +20953,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-680",
-   "self_type" : "type-679",
+   "referenced_type" : "type-654",
+   "self_type" : "type-653",
    "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"
   },
@@ -21042,8 +20963,38 @@
    "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-890",
-   "self_type" : "type-889",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-997",
+   "self_type" : "type-996",
    "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"
   },
@@ -21052,8 +21003,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-1015",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "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"
   },
@@ -21062,8 +21013,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-1102",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-1179",
+   "self_type" : "type-1178",
    "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"
   },
@@ -21072,8 +21023,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-1142",
-   "self_type" : "type-1141",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1701",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21082,8 +21033,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-1196",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1799",
    "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"
   },
@@ -21092,8 +21043,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-1411",
-   "self_type" : "type-1410",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1913",
    "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"
   },
@@ -21102,8 +21053,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-1931",
-   "self_type" : "type-1930",
+   "referenced_type" : "type-1990",
+   "self_type" : "type-1989",
    "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"
   },
@@ -21112,8 +21063,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-2029",
-   "self_type" : "type-2028",
+   "referenced_type" : "type-2070",
+   "self_type" : "type-2069",
    "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"
   },
@@ -21122,8 +21073,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-2143",
-   "self_type" : "type-2142",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2115",
    "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"
   },
@@ -21132,8 +21083,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-2219",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2176",
    "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"
   },
@@ -21142,8 +21093,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-2299",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
    "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"
   },
@@ -21152,8 +21103,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-2345",
-   "self_type" : "type-2344",
+   "referenced_type" : "type-2671",
+   "self_type" : "type-2670",
    "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"
   },
@@ -21162,8 +21113,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-2406",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2776",
+   "self_type" : "type-2775",
    "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"
   },
@@ -21172,8 +21123,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-2539",
-   "self_type" : "type-2538",
+   "referenced_type" : "type-2863",
+   "self_type" : "type-2862",
    "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"
   },
@@ -21182,8 +21133,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-2831",
-   "self_type" : "type-2830",
+   "referenced_type" : "type-2941",
+   "self_type" : "type-2940",
    "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"
   },
@@ -21192,8 +21143,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-2929",
-   "self_type" : "type-2928",
+   "referenced_type" : "type-3071",
+   "self_type" : "type-3070",
    "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"
   },
@@ -21202,18 +21153,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-3043",
-   "self_type" : "type-3042",
-   "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"
-  },
-  {
-   "alignment" : 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-3119",
-   "self_type" : "type-3118",
+   "referenced_type" : "type-3170",
+   "self_type" : "type-3169",
    "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"
   },
@@ -21232,8 +21173,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-3199",
-   "self_type" : "type-3198",
+   "referenced_type" : "type-3238",
+   "self_type" : "type-3237",
    "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"
   },
@@ -21242,8 +21183,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-3245",
-   "self_type" : "type-3244",
+   "referenced_type" : "type-3278",
+   "self_type" : "type-3277",
    "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"
   },
@@ -21252,8 +21193,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-3306",
-   "self_type" : "type-3305",
+   "referenced_type" : "type-3329",
+   "self_type" : "type-3328",
    "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"
   },
@@ -21262,8 +21203,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-3494",
-   "self_type" : "type-3493",
+   "referenced_type" : "type-3476",
+   "self_type" : "type-3475",
    "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"
   },
@@ -21272,8 +21213,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-459",
-   "self_type" : "type-458",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "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"
   },
@@ -21282,8 +21223,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-605",
-   "self_type" : "type-604",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
    "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"
   },
@@ -21292,8 +21233,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-694",
-   "self_type" : "type-693",
+   "referenced_type" : "type-778",
+   "self_type" : "type-777",
    "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"
   },
@@ -21302,8 +21243,18 @@
    "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-903",
-   "self_type" : "type-902",
+   "referenced_type" : "type-882",
+   "self_type" : "type-881",
+   "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"
+  },
+  {
+   "alignment" : 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",
    "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"
   },
@@ -21312,8 +21263,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-1020",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "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"
   },
@@ -21322,8 +21273,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-1106",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1186",
    "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"
   },
@@ -21332,8 +21283,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-1146",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-1706",
+   "self_type" : "type-1705",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21342,8 +21293,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-1200",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1803",
    "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"
   },
@@ -21352,8 +21303,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-1419",
-   "self_type" : "type-1418",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1917",
    "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"
   },
@@ -21362,8 +21313,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-1935",
-   "self_type" : "type-1934",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "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"
   },
@@ -21372,8 +21323,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-2033",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-2074",
+   "self_type" : "type-2073",
    "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"
   },
@@ -21382,8 +21333,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-2147",
-   "self_type" : "type-2146",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "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"
   },
@@ -21392,8 +21343,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-2223",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2180",
    "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"
   },
@@ -21402,8 +21353,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-2303",
-   "self_type" : "type-2302",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
    "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"
   },
@@ -21412,8 +21363,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-2350",
-   "self_type" : "type-2349",
+   "referenced_type" : "type-2675",
+   "self_type" : "type-2674",
    "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"
   },
@@ -21422,8 +21373,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-2410",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2780",
+   "self_type" : "type-2779",
    "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"
   },
@@ -21432,8 +21383,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-2543",
-   "self_type" : "type-2542",
+   "referenced_type" : "type-2867",
+   "self_type" : "type-2866",
    "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"
   },
@@ -21442,8 +21393,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-2835",
-   "self_type" : "type-2834",
+   "referenced_type" : "type-2945",
+   "self_type" : "type-2944",
    "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"
   },
@@ -21452,8 +21403,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-2933",
-   "self_type" : "type-2932",
+   "referenced_type" : "type-3077",
+   "self_type" : "type-3076",
    "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"
   },
@@ -21462,28 +21413,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-3047",
-   "self_type" : "type-3046",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3123",
-   "self_type" : "type-3122",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3203",
-   "self_type" : "type-3202",
+   "referenced_type" : "type-3175",
+   "self_type" : "type-3174",
    "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"
   },
@@ -21502,8 +21433,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-3250",
-   "self_type" : "type-3249",
+   "referenced_type" : "type-3242",
+   "self_type" : "type-3241",
    "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"
   },
@@ -21512,8 +21443,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-3310",
-   "self_type" : "type-3309",
+   "referenced_type" : "type-3282",
+   "self_type" : "type-3281",
    "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"
   },
@@ -21522,8 +21453,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-3498",
-   "self_type" : "type-3497",
+   "referenced_type" : "type-3333",
+   "self_type" : "type-3332",
    "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"
   },
@@ -21532,8 +21463,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-3480",
+   "self_type" : "type-3479",
    "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"
   },
@@ -21542,8 +21473,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-609",
-   "self_type" : "type-608",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21552,8 +21483,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-698",
-   "self_type" : "type-697",
+   "referenced_type" : "type-672",
+   "self_type" : "type-671",
    "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"
   },
@@ -21562,8 +21493,28 @@
    "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-909",
-   "self_type" : "type-908",
+   "referenced_type" : "type-783",
+   "self_type" : "type-782",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
    "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"
   },
@@ -21572,8 +21523,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-1017",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
    "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"
   },
@@ -21582,8 +21533,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-1104",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1184",
    "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"
   },
@@ -21592,8 +21543,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-1144",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1704",
+   "self_type" : "type-1703",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21602,8 +21553,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-1198",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-1802",
+   "self_type" : "type-1801",
    "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"
   },
@@ -21612,8 +21563,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-1417",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "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"
   },
@@ -21622,8 +21573,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-1933",
-   "self_type" : "type-1932",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1991",
    "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"
   },
@@ -21632,8 +21583,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-2031",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "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"
   },
@@ -21642,8 +21593,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-2145",
-   "self_type" : "type-2144",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2117",
    "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"
   },
@@ -21652,8 +21603,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-2221",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2179",
+   "self_type" : "type-2178",
    "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"
   },
@@ -21662,8 +21613,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-2301",
-   "self_type" : "type-2300",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "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"
   },
@@ -21672,8 +21623,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-2347",
-   "self_type" : "type-2346",
+   "referenced_type" : "type-2673",
+   "self_type" : "type-2672",
    "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"
   },
@@ -21682,8 +21633,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-2408",
-   "self_type" : "type-2407",
+   "referenced_type" : "type-2778",
+   "self_type" : "type-2777",
    "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"
   },
@@ -21692,8 +21643,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-2541",
-   "self_type" : "type-2540",
+   "referenced_type" : "type-2865",
+   "self_type" : "type-2864",
    "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"
   },
@@ -21702,8 +21653,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-2833",
-   "self_type" : "type-2832",
+   "referenced_type" : "type-2943",
+   "self_type" : "type-2942",
    "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"
   },
@@ -21712,8 +21663,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-2931",
-   "self_type" : "type-2930",
+   "referenced_type" : "type-3075",
+   "self_type" : "type-3074",
    "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"
   },
@@ -21722,28 +21673,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-3045",
-   "self_type" : "type-3044",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3121",
-   "self_type" : "type-3120",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3201",
-   "self_type" : "type-3200",
+   "referenced_type" : "type-3172",
+   "self_type" : "type-3171",
    "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"
   },
@@ -21762,8 +21693,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-3247",
-   "self_type" : "type-3246",
+   "referenced_type" : "type-3240",
+   "self_type" : "type-3239",
    "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"
   },
@@ -21772,8 +21703,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-3308",
-   "self_type" : "type-3307",
+   "referenced_type" : "type-3280",
+   "self_type" : "type-3279",
    "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"
   },
@@ -21782,8 +21713,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-3496",
-   "self_type" : "type-3495",
+   "referenced_type" : "type-3331",
+   "self_type" : "type-3330",
    "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"
   },
@@ -21792,8 +21723,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-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-3478",
+   "self_type" : "type-3477",
    "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"
   },
@@ -21802,8 +21733,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-607",
-   "self_type" : "type-606",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21812,8 +21743,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-696",
-   "self_type" : "type-695",
+   "referenced_type" : "type-670",
+   "self_type" : "type-669",
    "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"
   },
@@ -21822,8 +21753,28 @@
    "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-907",
-   "self_type" : "type-906",
+   "referenced_type" : "type-780",
+   "self_type" : "type-779",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
    "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"
   },
@@ -21832,8 +21783,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-1013",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
    "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"
   },
@@ -21842,8 +21793,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-1100",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-1177",
+   "self_type" : "type-1176",
    "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"
   },
@@ -21852,8 +21803,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-1140",
-   "self_type" : "type-1139",
+   "referenced_type" : "type-1699",
+   "self_type" : "type-1698",
    "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"
   },
@@ -21862,8 +21813,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-1194",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
    "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"
   },
@@ -21872,8 +21823,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-1409",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1911",
    "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"
   },
@@ -21882,8 +21833,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-1928",
-   "self_type" : "type-1927",
+   "referenced_type" : "type-1988",
+   "self_type" : "type-1987",
    "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"
   },
@@ -21892,8 +21843,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-2027",
-   "self_type" : "type-2026",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
    "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"
   },
@@ -21902,8 +21853,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-2141",
-   "self_type" : "type-2140",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2113",
    "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"
   },
@@ -21912,8 +21863,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-2217",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2174",
    "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"
   },
@@ -21922,8 +21873,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-2297",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2376",
    "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"
   },
@@ -21932,8 +21883,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-2343",
-   "self_type" : "type-2342",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
    "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"
   },
@@ -21942,8 +21893,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-2404",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2774",
+   "self_type" : "type-2773",
    "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"
   },
@@ -21952,8 +21903,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-2537",
-   "self_type" : "type-2536",
+   "referenced_type" : "type-2861",
+   "self_type" : "type-2860",
    "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"
   },
@@ -21962,8 +21913,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-2828",
-   "self_type" : "type-2827",
+   "referenced_type" : "type-2939",
+   "self_type" : "type-2938",
    "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"
   },
@@ -21972,28 +21923,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-2927",
-   "self_type" : "type-2926",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3041",
-   "self_type" : "type-3040",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3117",
-   "self_type" : "type-3116",
+   "referenced_type" : "type-3069",
+   "self_type" : "type-3068",
    "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"
   },
@@ -22012,8 +21943,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-3197",
-   "self_type" : "type-3196",
+   "referenced_type" : "type-3168",
+   "self_type" : "type-3167",
    "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"
   },
@@ -22022,8 +21953,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-3243",
-   "self_type" : "type-3242",
+   "referenced_type" : "type-3236",
+   "self_type" : "type-3235",
    "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"
   },
@@ -22032,8 +21963,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-3304",
-   "self_type" : "type-3303",
+   "referenced_type" : "type-3276",
+   "self_type" : "type-3275",
    "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"
   },
@@ -22042,8 +21973,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-3492",
-   "self_type" : "type-3491",
+   "referenced_type" : "type-3327",
+   "self_type" : "type-3326",
    "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"
   },
@@ -22052,8 +21983,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-457",
-   "self_type" : "type-456",
+   "referenced_type" : "type-3474",
+   "self_type" : "type-3473",
    "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"
   },
@@ -22062,8 +21993,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-603",
-   "self_type" : "type-602",
+   "referenced_type" : "type-455",
+   "self_type" : "type-454",
    "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"
   },
@@ -22072,8 +22003,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-692",
-   "self_type" : "type-691",
+   "referenced_type" : "type-665",
+   "self_type" : "type-664",
    "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"
   },
@@ -22082,8 +22013,28 @@
    "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-901",
-   "self_type" : "type-900",
+   "referenced_type" : "type-776",
+   "self_type" : "type-775",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
    "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"
   },
@@ -22092,8 +22043,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-1022",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1018",
+   "self_type" : "type-1017",
    "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"
   },
@@ -22102,8 +22053,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-1108",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1188",
    "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"
   },
@@ -22112,8 +22063,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-1148",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1708",
+   "self_type" : "type-1707",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22122,8 +22073,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-1202",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1806",
+   "self_type" : "type-1805",
    "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"
   },
@@ -22132,8 +22083,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-1421",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "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"
   },
@@ -22142,8 +22093,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-1937",
-   "self_type" : "type-1936",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1995",
    "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"
   },
@@ -22152,8 +22103,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-2035",
-   "self_type" : "type-2034",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2075",
    "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"
   },
@@ -22162,8 +22113,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-2149",
-   "self_type" : "type-2148",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2122",
    "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"
   },
@@ -22172,8 +22123,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-2225",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2184",
    "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"
   },
@@ -22182,8 +22133,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-2305",
-   "self_type" : "type-2304",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2384",
    "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"
   },
@@ -22192,8 +22143,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-2352",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2676",
    "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"
   },
@@ -22202,8 +22153,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-2414",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2782",
+   "self_type" : "type-2781",
    "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"
   },
@@ -22212,8 +22163,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-2545",
-   "self_type" : "type-2544",
+   "referenced_type" : "type-2869",
+   "self_type" : "type-2868",
    "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"
   },
@@ -22222,8 +22173,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-2837",
-   "self_type" : "type-2836",
+   "referenced_type" : "type-2948",
+   "self_type" : "type-2947",
    "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"
   },
@@ -22232,8 +22183,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-2935",
-   "self_type" : "type-2934",
+   "referenced_type" : "type-3079",
+   "self_type" : "type-3078",
    "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"
   },
@@ -22242,8 +22193,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-3049",
-   "self_type" : "type-3048",
+   "referenced_type" : "type-3177",
+   "self_type" : "type-3176",
    "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"
   },
@@ -22252,18 +22203,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-3125",
-   "self_type" : "type-3124",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3205",
-   "self_type" : "type-3204",
+   "referenced_type" : "type-3244",
+   "self_type" : "type-3243",
    "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"
   },
@@ -22282,838 +22223,958 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3284",
+   "self_type" : "type-3283",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3335",
+   "self_type" : "type-3334",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3482",
+   "self_type" : "type-3481",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-785",
+   "self_type" : "type-784",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 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",
+   "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"
+  },
+  {
+   "alignment" : 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-1206",
+   "self_type" : "type-1205",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1813",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2003",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2085",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2131",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2192",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2396",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-2790",
+   "self_type" : "type-2789",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-2957",
+   "self_type" : "type-2956",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3187",
+   "self_type" : "type-3186",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "referenced_type" : "type-3252",
    "self_type" : "type-3251",
-   "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"
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3292",
+   "self_type" : "type-3291",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3343",
+   "self_type" : "type-3342",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3493",
+   "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"
+  },
+  {
+   "alignment" : 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",
+   "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"
+  },
+  {
+   "alignment" : 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",
+   "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"
+  },
+  {
+   "alignment" : 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",
+   "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"
+  },
+  {
+   "alignment" : 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",
+   "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"
   },
   {
    "alignment" : 4,
    "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-3314",
-   "self_type" : "type-3313",
-   "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"
+   "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",
+   "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"
   },
   {
    "alignment" : 4,
    "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-3500",
-   "self_type" : "type-3499",
-   "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"
+   "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-1204",
+   "self_type" : "type-1203",
+   "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"
   },
   {
    "alignment" : 4,
    "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>",
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1811",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2083",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2129",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2190",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2394",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-2788",
+   "self_type" : "type-2787",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-2955",
+   "self_type" : "type-2954",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3185",
+   "self_type" : "type-3184",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3250",
+   "self_type" : "type-3249",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3290",
+   "self_type" : "type-3289",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3341",
+   "self_type" : "type-3340",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3492",
+   "self_type" : "type-3491",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-1202",
+   "self_type" : "type-1201",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1809",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-1999",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2081",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2127",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2188",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2392",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-2786",
+   "self_type" : "type-2785",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-2952",
+   "self_type" : "type-2951",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3183",
+   "self_type" : "type-3182",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3248",
+   "self_type" : "type-3247",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3288",
+   "self_type" : "type-3287",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3339",
+   "self_type" : "type-3338",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3490",
+   "self_type" : "type-3489",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-1020",
+   "self_type" : "type-1019",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-1200",
+   "self_type" : "type-1199",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1807",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1997",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2079",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2124",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2186",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-2784",
+   "self_type" : "type-2783",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-2950",
+   "self_type" : "type-2949",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3181",
+   "self_type" : "type-3180",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3246",
+   "self_type" : "type-3245",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3286",
+   "self_type" : "type-3285",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3337",
+   "self_type" : "type-3336",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3488",
+   "self_type" : "type-3487",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
    "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"
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
   {
    "alignment" : 4,
    "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-612",
-   "self_type" : "type-611",
+   "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",
    "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"
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
   {
    "alignment" : 4,
    "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-701",
-   "self_type" : "type-700",
+   "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",
    "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"
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
   {
    "alignment" : 4,
    "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-911",
-   "self_type" : "type-910",
+   "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",
    "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"
-  },
-  {
-   "alignment" : 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-1032",
-   "self_type" : "type-1031",
-   "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"
-  },
-  {
-   "alignment" : 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-1116",
-   "self_type" : "type-1115",
-   "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"
-  },
-  {
-   "alignment" : 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-1156",
-   "self_type" : "type-1155",
-   "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"
-  },
-  {
-   "alignment" : 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-1210",
-   "self_type" : "type-1209",
-   "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"
-  },
-  {
-   "alignment" : 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-1438",
-   "self_type" : "type-1437",
-   "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"
-  },
-  {
-   "alignment" : 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-2043",
-   "self_type" : "type-2042",
-   "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"
-  },
-  {
-   "alignment" : 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-2233",
-   "self_type" : "type-2232",
-   "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"
-  },
-  {
-   "alignment" : 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-2315",
-   "self_type" : "type-2314",
-   "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"
-  },
-  {
-   "alignment" : 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-2361",
-   "self_type" : "type-2360",
-   "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"
-  },
-  {
-   "alignment" : 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-2422",
-   "self_type" : "type-2421",
-   "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"
-  },
-  {
-   "alignment" : 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-2557",
-   "self_type" : "type-2556",
-   "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"
-  },
-  {
-   "alignment" : 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-2943",
-   "self_type" : "type-2942",
-   "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"
-  },
-  {
-   "alignment" : 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-3133",
-   "self_type" : "type-3132",
-   "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"
-  },
-  {
-   "alignment" : 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-3215",
-   "self_type" : "type-3214",
-   "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"
-  },
-  {
-   "alignment" : 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-3261",
-   "self_type" : "type-3260",
-   "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"
-  },
-  {
-   "alignment" : 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-3322",
-   "self_type" : "type-3321",
-   "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"
-  },
-  {
-   "alignment" : 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-3512",
-   "self_type" : "type-3511",
-   "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"
-  },
-  {
-   "alignment" : 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-475",
-   "self_type" : "type-474",
-   "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"
-  },
-  {
-   "alignment" : 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-710",
-   "self_type" : "type-709",
-   "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"
   },
   {
    "alignment" : 4,
    "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-1030",
-   "self_type" : "type-1029",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-1114",
-   "self_type" : "type-1113",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-1154",
-   "self_type" : "type-1153",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-1208",
-   "self_type" : "type-1207",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-1436",
-   "self_type" : "type-1435",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2041",
-   "self_type" : "type-2040",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2231",
-   "self_type" : "type-2230",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2313",
-   "self_type" : "type-2312",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2359",
-   "self_type" : "type-2358",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2420",
-   "self_type" : "type-2419",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2555",
-   "self_type" : "type-2554",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2941",
-   "self_type" : "type-2940",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3131",
-   "self_type" : "type-3130",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3213",
-   "self_type" : "type-3212",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3259",
-   "self_type" : "type-3258",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3320",
-   "self_type" : "type-3319",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3510",
-   "self_type" : "type-3509",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-473",
-   "self_type" : "type-472",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-708",
-   "self_type" : "type-707",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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>",
+   "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",
-   "size" : 260,
+   "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"
   },
   {
    "alignment" : 4,
    "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-1112",
-   "self_type" : "type-1111",
-   "size" : 260,
+   "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-1208",
+   "self_type" : "type-1207",
+   "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"
   },
   {
    "alignment" : 4,
    "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-1152",
-   "self_type" : "type-1151",
-   "size" : 260,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1815",
+   "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"
   },
   {
    "alignment" : 4,
    "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-1206",
-   "self_type" : "type-1205",
-   "size" : 260,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-2006",
+   "self_type" : "type-2005",
+   "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"
   },
   {
    "alignment" : 4,
    "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-1434",
-   "self_type" : "type-1433",
-   "size" : 260,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
+   "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"
   },
   {
    "alignment" : 4,
    "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-2039",
-   "self_type" : "type-2038",
-   "size" : 260,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2133",
+   "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"
   },
   {
    "alignment" : 4,
    "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-2229",
-   "self_type" : "type-2228",
-   "size" : 260,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2194",
+   "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"
   },
   {
    "alignment" : 4,
    "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-2311",
-   "self_type" : "type-2310",
-   "size" : 260,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2398",
+   "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"
   },
   {
    "alignment" : 4,
    "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-2357",
-   "self_type" : "type-2356",
-   "size" : 260,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-2792",
+   "self_type" : "type-2791",
+   "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"
   },
   {
    "alignment" : 4,
    "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-2418",
-   "self_type" : "type-2417",
-   "size" : 260,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-2959",
+   "self_type" : "type-2958",
+   "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"
   },
   {
    "alignment" : 4,
    "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-2553",
-   "self_type" : "type-2552",
-   "size" : 260,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3189",
+   "self_type" : "type-3188",
+   "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"
   },
   {
    "alignment" : 4,
    "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-2939",
-   "self_type" : "type-2938",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3129",
-   "self_type" : "type-3128",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3211",
-   "self_type" : "type-3210",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3257",
-   "self_type" : "type-3256",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3318",
-   "self_type" : "type-3317",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3508",
-   "self_type" : "type-3507",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-471",
-   "self_type" : "type-470",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-705",
-   "self_type" : "type-704",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-1026",
-   "self_type" : "type-1025",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-1110",
-   "self_type" : "type-1109",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-1150",
-   "self_type" : "type-1149",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-1204",
-   "self_type" : "type-1203",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-1432",
-   "self_type" : "type-1431",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2037",
-   "self_type" : "type-2036",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2227",
-   "self_type" : "type-2226",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2309",
-   "self_type" : "type-2308",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2354",
-   "self_type" : "type-2353",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2416",
-   "self_type" : "type-2415",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2551",
-   "self_type" : "type-2550",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2937",
-   "self_type" : "type-2936",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3127",
-   "self_type" : "type-3126",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3209",
-   "self_type" : "type-3208",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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>",
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "referenced_type" : "type-3254",
    "self_type" : "type-3253",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3316",
-   "self_type" : "type-3315",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3506",
-   "self_type" : "type-3505",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-703",
-   "self_type" : "type-702",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-1034",
-   "self_type" : "type-1033",
    "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"
   },
@@ -23122,8 +23183,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-1118",
-   "self_type" : "type-1117",
+   "referenced_type" : "type-3294",
+   "self_type" : "type-3293",
    "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"
   },
@@ -23132,8 +23193,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-1158",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-3345",
+   "self_type" : "type-3344",
    "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"
   },
@@ -23142,8 +23203,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-1212",
-   "self_type" : "type-1211",
+   "referenced_type" : "type-3496",
+   "self_type" : "type-3495",
    "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"
   },
@@ -23152,8 +23213,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-1440",
-   "self_type" : "type-1439",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
    "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"
   },
@@ -23162,8 +23223,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-2045",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-797",
+   "self_type" : "type-796",
    "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"
   },
@@ -23172,8 +23233,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-2235",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-900",
+   "self_type" : "type-899",
    "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"
   },
@@ -23182,118 +23243,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-2317",
-   "self_type" : "type-2316",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2363",
-   "self_type" : "type-2362",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2424",
-   "self_type" : "type-2423",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2559",
-   "self_type" : "type-2558",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-2945",
-   "self_type" : "type-2944",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3135",
-   "self_type" : "type-3134",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3217",
-   "self_type" : "type-3216",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3263",
-   "self_type" : "type-3262",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3324",
-   "self_type" : "type-3323",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-3514",
-   "self_type" : "type-3513",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-477",
-   "self_type" : "type-476",
-   "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"
-  },
-  {
-   "alignment" : 4,
-   "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-712",
-   "self_type" : "type-711",
+   "referenced_type" : "type-956",
+   "self_type" : "type-955",
    "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"
   },
@@ -23302,8 +23253,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1084",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-1633",
+   "self_type" : "type-1632",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23322,8 +23273,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1862",
-   "self_type" : "type-1861",
+   "referenced_type" : "type-1774",
+   "self_type" : "type-1773",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23332,8 +23283,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2003",
-   "self_type" : "type-2002",
+   "referenced_type" : "type-1896",
+   "self_type" : "type-1895",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23342,8 +23293,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2125",
-   "self_type" : "type-2124",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1969",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23352,388 +23303,488 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2049",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2601",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2839",
+   "self_type" : "type-2838",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-2912",
+   "self_type" : "type-2911",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3052",
+   "self_type" : "type-3051",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3148",
+   "self_type" : "type-3147",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3220",
+   "self_type" : "type-3219",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-426",
+   "self_type" : "type-425",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::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",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::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",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-861",
+   "self_type" : "type-860",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2182",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-2735",
+   "self_type" : "type-2734",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-3073",
+   "self_type" : "type-3072",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_denorm_style",
+   "name" : "const std::float_denorm_style",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1979",
+   "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-2246",
+   "self_type" : "type-2245",
+   "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-2727",
+   "self_type" : "type-2726",
+   "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-2845",
+   "self_type" : "type-2844",
+   "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-3365",
+   "self_type" : "type-3364",
+   "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-2046",
+   "self_type" : "type-2045",
+   "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-2248",
+   "self_type" : "type-2247",
+   "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-2730",
+   "self_type" : "type-2729",
+   "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-2915",
+   "self_type" : "type-2914",
+   "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-3367",
+   "self_type" : "type-3366",
+   "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",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<float (float)>",
+   "name" : "const std::function<float (float)>",
+   "referenced_type" : "type-1065",
+   "self_type" : "type-1064",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<float (float)>",
+   "name" : "const std::function<float (float)>",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2266",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<float (float)>",
+   "name" : "const std::function<float (float)>",
+   "referenced_type" : "type-2747",
+   "self_type" : "type-2746",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::function<float (float)>",
+   "name" : "const std::function<float (float)>",
+   "referenced_type" : "type-3192",
+   "self_type" : "type-3191",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
+   "name" : "const std::shared_ptr<android::FenceTime>",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
+   "name" : "const std::shared_ptr<android::FenceTime>",
+   "referenced_type" : "type-2809",
+   "self_type" : "type-2808",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
+   "name" : "const std::shared_ptr<android::FenceTime>",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3610",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
+   "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2142",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
+   "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
+   "referenced_type" : "type-3300",
+   "self_type" : "type-3299",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
+  },
+  {
+   "alignment" : 4,
+   "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-968",
+   "self_type" : "type-967",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1031",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1238",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-1582",
+   "self_type" : "type-1581",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1818",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-1888",
+   "self_type" : "type-1887",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-1952",
+   "self_type" : "type-1951",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2021",
+   "self_type" : "type-2020",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2137",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "referenced_type" : "type-2199",
    "self_type" : "type-2198",
    "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2279",
-   "self_type" : "type-2278",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2762",
-   "self_type" : "type-2761",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2903",
-   "self_type" : "type-2902",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3025",
-   "self_type" : "type-3024",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3099",
-   "self_type" : "type-3098",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3179",
-   "self_type" : "type-3178",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-883",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-993",
-   "self_type" : "type-992",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2411",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-3312",
-   "self_type" : "type-3311",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-412",
-   "self_type" : "type-411",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-905",
-   "self_type" : "type-904",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_denorm_style",
-   "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1255",
-   "self_type" : "type-1254",
-   "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-2209",
-   "self_type" : "type-2208",
-   "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-3109",
-   "self_type" : "type-3108",
-   "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-3376",
-   "self_type" : "type-3375",
-   "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-398",
-   "self_type" : "type-397",
-   "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-586",
-   "self_type" : "type-585",
-   "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-1257",
-   "self_type" : "type-1256",
-   "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-2275",
-   "self_type" : "type-2274",
-   "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-3175",
-   "self_type" : "type-3174",
-   "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-3378",
-   "self_type" : "type-3377",
-   "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-407",
-   "self_type" : "type-406",
-   "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-668",
-   "self_type" : "type-667",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<float (float)>",
-   "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1036",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<float (float)>",
-   "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2458",
-   "self_type" : "type-2457",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<float (float)>",
-   "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-3392",
-   "self_type" : "type-3391",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::function<float (float)>",
-   "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-425",
-   "self_type" : "type-424",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1620",
-   "self_type" : "type-1619",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2674",
-   "self_type" : "type-2673",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-3629",
-   "self_type" : "type-3628",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-512",
-   "self_type" : "type-511",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1167",
-   "self_type" : "type-1166",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
-  },
-  {
-   "alignment" : 4,
-   "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-2372",
-   "self_type" : "type-2371",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
-  },
-  {
-   "alignment" : 4,
-   "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-3272",
-   "self_type" : "type-3271",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1066",
-   "self_type" : "type-1065",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2416",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23742,8 +23793,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1161",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2550",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23752,8 +23803,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1215",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-2682",
+   "self_type" : "type-2681",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23762,8 +23813,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-2795",
+   "self_type" : "type-2794",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23772,8 +23823,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-2821",
+   "self_type" : "type-2820",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23782,8 +23833,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1942",
-   "self_type" : "type-1941",
+   "referenced_type" : "type-2872",
+   "self_type" : "type-2871",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23792,8 +23843,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2048",
-   "self_type" : "type-2047",
+   "referenced_type" : "type-2963",
+   "self_type" : "type-2962",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23802,8 +23853,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2117",
-   "self_type" : "type-2116",
+   "referenced_type" : "type-3044",
+   "self_type" : "type-3043",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23812,8 +23863,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2180",
+   "referenced_type" : "type-3119",
+   "self_type" : "type-3118",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23822,8 +23873,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-3202",
+   "self_type" : "type-3201",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23832,98 +23883,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2366",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2427",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2577",
-   "self_type" : "type-2576",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2711",
-   "self_type" : "type-2710",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2842",
-   "self_type" : "type-2841",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2948",
-   "self_type" : "type-2947",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3017",
-   "self_type" : "type-3016",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3081",
-   "self_type" : "type-3080",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3150",
-   "self_type" : "type-3149",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3267",
-   "self_type" : "type-3266",
+   "referenced_type" : "type-3297",
+   "self_type" : "type-3296",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23942,8 +23903,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3328",
-   "self_type" : "type-3327",
+   "referenced_type" : "type-3348",
+   "self_type" : "type-3347",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23952,8 +23913,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3532",
-   "self_type" : "type-3531",
+   "referenced_type" : "type-3514",
+   "self_type" : "type-3513",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23972,8 +23933,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-481",
-   "self_type" : "type-480",
+   "referenced_type" : "type-479",
+   "self_type" : "type-478",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23982,8 +23943,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-540",
-   "self_type" : "type-539",
+   "referenced_type" : "type-634",
+   "self_type" : "type-633",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23992,8 +23953,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-616",
-   "self_type" : "type-615",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -24002,8 +23963,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-716",
-   "self_type" : "type-715",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -24012,18 +23973,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-876",
-   "self_type" : "type-875",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-961",
-   "self_type" : "type-960",
+   "referenced_type" : "type-960",
+   "self_type" : "type-959",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -24063,7 +24014,7 @@
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
    "referenced_type" : "type-3",
-   "self_type" : "type-644",
+   "self_type" : "type-830",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24072,7 +24023,7 @@
    "linker_set_key" : "const void",
    "name" : "const void",
    "referenced_type" : "type-151",
-   "self_type" : "type-1350",
+   "self_type" : "type-1118",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -24080,8 +24031,8 @@
    "is_const" : true,
    "linker_set_key" : "unsigned int const[3]",
    "name" : "unsigned int const[3]",
-   "referenced_type" : "type-778",
-   "self_type" : "type-814",
+   "referenced_type" : "type-941",
+   "self_type" : "type-948",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -24154,8 +24105,8 @@
    ],
    "linker_set_key" : "AHardwareBuffer_Desc",
    "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-919",
-   "self_type" : "type-919",
+   "referenced_type" : "type-683",
+   "self_type" : "type-683",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Desc"
@@ -24181,8 +24132,8 @@
    ],
    "linker_set_key" : "AHardwareBuffer_Plane",
    "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-751",
-   "self_type" : "type-751",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Plane"
@@ -24198,13 +24149,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 32,
-     "referenced_type" : "type-750"
+     "referenced_type" : "type-508"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Planes",
    "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
    "size" : 52,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Planes"
@@ -24215,7 +24166,7 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-757"
+     "referenced_type" : "type-518"
     },
     {
      "field_name" : "width",
@@ -24250,7 +24201,7 @@
     {
      "field_name" : "reserved",
      "field_offset" : 448,
-     "referenced_type" : "type-762"
+     "referenced_type" : "type-523"
     },
     {
      "field_name" : "handle",
@@ -24265,13 +24216,13 @@
     {
      "field_name" : "reserved_proc",
      "field_offset" : 576,
-     "referenced_type" : "type-763"
+     "referenced_type" : "type-524"
     }
    ],
    "linker_set_key" : "ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-756",
-   "self_type" : "type-756",
+   "referenced_type" : "type-517",
+   "self_type" : "type-517",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "ANativeWindowBuffer"
@@ -24302,8 +24253,8 @@
    ],
    "linker_set_key" : "ARect",
    "name" : "ARect",
-   "referenced_type" : "type-1223",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1242",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/arect/include/android/rect.h",
    "unique_id" : "ARect"
@@ -24314,33 +24265,33 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-547"
     },
     {
      "field_name" : "alloc",
      "field_offset" : 512,
-     "referenced_type" : "type-838"
+     "referenced_type" : "type-602"
     },
     {
      "field_name" : "free",
      "field_offset" : 544,
-     "referenced_type" : "type-841"
+     "referenced_type" : "type-605"
     },
     {
      "field_name" : "dump",
      "field_offset" : 576,
-     "referenced_type" : "type-843"
+     "referenced_type" : "type-607"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 608,
-     "referenced_type" : "type-845"
+     "referenced_type" : "type-609"
     }
    ],
    "linker_set_key" : "alloc_device_t",
    "name" : "alloc_device_t",
-   "referenced_type" : "type-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-601",
+   "self_type" : "type-601",
    "size" : 104,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
    "unique_id" : "alloc_device_t"
@@ -24350,7 +24301,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-756"
+     "referenced_type" : "type-517"
     },
     {
      "referenced_type" : "type-172"
@@ -24359,11 +24310,11 @@
    "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-755",
-   "self_type" : "type-755",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-756", "type-764", "type-172", "type-757" ],
+   "template_args" : [ "type-517", "type-525", "type-172", "type-518" ],
    "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
    "vtable_components" :
    [
@@ -24397,84 +24348,55 @@
    ]
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFrameLines",
-     "referenced_type" : "type-1217"
-    }
-   ],
-   "linker_set_key" : "android::CallStack",
-   "name" : "android::CallStack",
-   "record_kind" : "class",
-   "referenced_type" : "type-1231",
-   "self_type" : "type-1231",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStackE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CallStack::StackDeleter",
-   "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-1235",
-   "self_type" : "type-1235",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mName",
-     "referenced_type" : "type-868"
+     "referenced_type" : "type-980"
     },
     {
      "access" : "private",
      "field_name" : "mRGBtoXYZ",
      "field_offset" : 96,
-     "referenced_type" : "type-718"
+     "referenced_type" : "type-903"
     },
     {
      "access" : "private",
      "field_name" : "mXYZtoRGB",
      "field_offset" : 384,
-     "referenced_type" : "type-718"
+     "referenced_type" : "type-903"
     },
     {
      "access" : "private",
      "field_name" : "mParameters",
      "field_offset" : 672,
-     "referenced_type" : "type-869"
+     "referenced_type" : "type-981"
     },
     {
      "access" : "private",
      "field_name" : "mOETF",
      "field_offset" : 896,
-     "referenced_type" : "type-870"
+     "referenced_type" : "type-982"
     },
     {
      "access" : "private",
      "field_name" : "mEOTF",
      "field_offset" : 1088,
-     "referenced_type" : "type-871"
+     "referenced_type" : "type-983"
     },
     {
      "access" : "private",
      "field_name" : "mClamper",
      "field_offset" : 1280,
-     "referenced_type" : "type-872"
+     "referenced_type" : "type-984"
     },
     {
      "access" : "private",
      "field_name" : "mPrimaries",
      "field_offset" : 1472,
-     "referenced_type" : "type-873"
+     "referenced_type" : "type-985"
     },
     {
      "access" : "private",
@@ -24486,8 +24408,8 @@
    "linker_set_key" : "android::ColorSpace",
    "name" : "android::ColorSpace",
    "record_kind" : "class",
-   "referenced_type" : "type-867",
-   "self_type" : "type-867",
+   "referenced_type" : "type-979",
+   "self_type" : "type-979",
    "size" : 216,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h",
    "unique_id" : "_ZTSN7android10ColorSpaceE"
@@ -24533,8 +24455,8 @@
    ],
    "linker_set_key" : "android::ColorSpace::TransferParameters",
    "name" : "android::ColorSpace::TransferParameters",
-   "referenced_type" : "type-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-981",
+   "self_type" : "type-981",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h",
    "unique_id" : "_ZTSN7android10ColorSpace18TransferParametersE"
@@ -24546,26 +24468,26 @@
     {
      "access" : "private",
      "field_name" : "mSource",
-     "referenced_type" : "type-867"
+     "referenced_type" : "type-979"
     },
     {
      "access" : "private",
      "field_name" : "mDestination",
      "field_offset" : 1728,
-     "referenced_type" : "type-867"
+     "referenced_type" : "type-979"
     },
     {
      "access" : "private",
      "field_name" : "mTransform",
      "field_offset" : 3456,
-     "referenced_type" : "type-718"
+     "referenced_type" : "type-903"
     }
    ],
    "linker_set_key" : "android::ColorSpaceConnector",
    "name" : "android::ColorSpaceConnector",
    "record_kind" : "class",
-   "referenced_type" : "type-963",
-   "self_type" : "type-963",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1043",
    "size" : 472,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h",
    "unique_id" : "_ZTSN7android19ColorSpaceConnectorE"
@@ -24574,8 +24496,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-1475",
-   "self_type" : "type-1475",
+   "referenced_type" : "type-1247",
+   "self_type" : "type-1247",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -24604,10 +24526,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1570"
+     "referenced_type" : "type-1342"
     },
     {
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-1344"
     }
    ],
    "fields" :
@@ -24616,14 +24538,14 @@
      "access" : "private",
      "field_name" : "mFenceFd",
      "field_offset" : 32,
-     "referenced_type" : "type-1569"
+     "referenced_type" : "type-1341"
     }
    ],
    "linker_set_key" : "android::Fence",
    "name" : "android::Fence",
    "record_kind" : "class",
-   "referenced_type" : "type-1568",
-   "self_type" : "type-1568",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1340",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
    "unique_id" : "_ZTSN7android5FenceE"
@@ -24635,32 +24557,32 @@
     {
      "access" : "private",
      "field_name" : "mState",
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-1377"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 32,
-     "referenced_type" : "type-1607"
+     "referenced_type" : "type-1379"
     },
     {
      "access" : "private",
      "field_name" : "mFence",
      "field_offset" : 64,
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1357"
     },
     {
      "access" : "private",
      "field_name" : "mSignalTime",
      "field_offset" : 128,
-     "referenced_type" : "type-1608"
+     "referenced_type" : "type-1380"
     }
    ],
    "linker_set_key" : "android::FenceTime",
    "name" : "android::FenceTime",
    "record_kind" : "class",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1376",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTimeE"
@@ -24670,19 +24592,19 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1613"
+     "referenced_type" : "type-1385"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1612"
+     "referenced_type" : "type-1384"
     },
     {
      "field_name" : "fence",
      "field_offset" : 32,
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-1357"
     },
     {
      "field_name" : "signalTime",
@@ -24692,8 +24614,8 @@
    ],
    "linker_set_key" : "android::FenceTime::Snapshot",
    "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
@@ -24705,20 +24627,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1626"
+     "referenced_type" : "type-1398"
     },
     {
      "access" : "private",
      "field_name" : "mQueue",
      "field_offset" : 32,
-     "referenced_type" : "type-1627"
+     "referenced_type" : "type-1399"
     }
    ],
    "linker_set_key" : "android::FenceTimeline",
    "name" : "android::FenceTimeline",
    "record_kind" : "class",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1625",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1397",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android13FenceTimelineE"
@@ -24730,20 +24652,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1631"
+     "referenced_type" : "type-1403"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1632"
+     "referenced_type" : "type-1404"
     }
    ],
    "linker_set_key" : "android::FenceToFenceTimeMap",
    "name" : "android::FenceToFenceTimeMap",
    "record_kind" : "class",
-   "referenced_type" : "type-1630",
-   "self_type" : "type-1630",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1402",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
@@ -24753,11 +24675,11 @@
    "linker_set_key" : "android::Flattenable<android::Fence>",
    "name" : "android::Flattenable<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1344",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1568" ],
+   "template_args" : [ "type-1340" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
   },
   {
@@ -24765,11 +24687,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1613",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1385",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1611" ],
+   "template_args" : [ "type-1383" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -24777,11 +24699,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-532",
+   "self_type" : "type-532",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-764" ],
+   "template_args" : [ "type-525" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -24789,8 +24711,8 @@
    "linker_set_key" : "android::FlattenableUtils",
    "name" : "android::FlattenableUtils",
    "record_kind" : "class",
-   "referenced_type" : "type-1476",
-   "self_type" : "type-1476",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1248",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
    "unique_id" : "_ZTSN7android16FlattenableUtilsE"
@@ -24822,8 +24744,8 @@
    "linker_set_key" : "android::FloatRect",
    "name" : "android::FloatRect",
    "record_kind" : "class",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1503",
+   "referenced_type" : "type-1275",
+   "self_type" : "type-1275",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h",
    "unique_id" : "_ZTSN7android9FloatRectE"
@@ -24833,7 +24755,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1647"
+     "referenced_type" : "type-1419"
     }
    ],
    "fields" :
@@ -24845,24 +24767,24 @@
     {
      "field_name" : "desiredPresentTimesNano",
      "field_offset" : 64,
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-1421"
     },
     {
      "field_name" : "actualPresentTimesNano",
      "field_offset" : 224,
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-1421"
     },
     {
      "field_name" : "frameReadyTimesNano",
      "field_offset" : 384,
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-1421"
     }
    ],
    "linker_set_key" : "android::FrameStats",
    "name" : "android::FrameStats",
    "record_kind" : "class",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1648",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1420",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h",
    "unique_id" : "_ZTSN7android10FrameStatsE"
@@ -25011,10 +24933,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-755"
+     "referenced_type" : "type-516"
     },
     {
-     "referenced_type" : "type-771"
+     "referenced_type" : "type-532"
     }
    ],
    "fields" :
@@ -25029,7 +24951,7 @@
      "access" : "private",
      "field_name" : "mBufferMapper",
      "field_offset" : 864,
-     "referenced_type" : "type-765"
+     "referenced_type" : "type-526"
     },
     {
      "access" : "private",
@@ -25071,14 +24993,14 @@
      "access" : "private",
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1152,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-531"
     }
    ],
    "linker_set_key" : "android::GraphicBuffer",
    "name" : "android::GraphicBuffer",
    "record_kind" : "class",
-   "referenced_type" : "type-764",
-   "self_type" : "type-764",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 160,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "unique_id" : "_ZTSN7android13GraphicBufferE",
@@ -25118,7 +25040,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-541"
     }
    ],
    "fields" :
@@ -25126,20 +25048,20 @@
     {
      "access" : "private",
      "field_name" : "mMapper",
-     "referenced_type" : "type-765"
+     "referenced_type" : "type-526"
     },
     {
      "access" : "private",
      "field_name" : "mAllocator",
      "field_offset" : 32,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-543"
     }
    ],
    "linker_set_key" : "android::GraphicBufferAllocator",
    "name" : "android::GraphicBufferAllocator",
    "record_kind" : "class",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-542",
+   "self_type" : "type-542",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
    "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
@@ -25186,13 +25108,13 @@
     {
      "field_name" : "requestorName",
      "field_offset" : 288,
-     "referenced_type" : "type-913"
+     "referenced_type" : "type-677"
     }
    ],
    "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-912",
-   "self_type" : "type-912",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
    "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
@@ -25202,7 +25124,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-530"
     }
    ],
    "fields" :
@@ -25210,20 +25132,20 @@
     {
      "access" : "private",
      "field_name" : "mMapper",
-     "referenced_type" : "type-767"
+     "referenced_type" : "type-528"
     },
     {
      "access" : "private",
      "field_name" : "mMapperVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-768"
+     "referenced_type" : "type-529"
     }
    ],
    "linker_set_key" : "android::GraphicBufferMapper",
    "name" : "android::GraphicBufferMapper",
    "record_kind" : "class",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
    "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
@@ -25233,7 +25155,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1162"
+     "referenced_type" : "type-963"
     }
    ],
    "fields" :
@@ -25241,7 +25163,7 @@
     {
      "access" : "private",
      "field_name" : "mSupportedHdrTypes",
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-965"
     },
     {
      "access" : "private",
@@ -25265,8 +25187,8 @@
    "linker_set_key" : "android::HdrCapabilities",
    "name" : "android::HdrCapabilities",
    "record_kind" : "class",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-964",
+   "self_type" : "type-964",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h",
    "unique_id" : "_ZTSN7android15HdrCapabilitiesE"
@@ -25298,17 +25220,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-711"
     }
    ],
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-949",
-   "self_type" : "type-949",
+   "referenced_type" : "type-715",
+   "self_type" : "type-715",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-142", "type-912" ],
+   "template_args" : [ "type-142", "type-676" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -25316,11 +25238,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1419",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1648" ],
+   "template_args" : [ "type-1420" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -25328,11 +25250,11 @@
    "linker_set_key" : "android::LightFlattenable<android::HdrCapabilities>",
    "name" : "android::LightFlattenable<android::HdrCapabilities>",
    "record_kind" : "class",
-   "referenced_type" : "type-1162",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-963",
+   "self_type" : "type-963",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1163" ],
+   "template_args" : [ "type-964" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_15HdrCapabilitiesEEE"
   },
   {
@@ -25340,11 +25262,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Point>",
    "name" : "android::LightFlattenable<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-1252",
+   "self_type" : "type-1252",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1481" ],
+   "template_args" : [ "type-1253" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
   },
   {
@@ -25352,11 +25274,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Rect>",
    "name" : "android::LightFlattenable<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-1225",
-   "self_type" : "type-1225",
+   "referenced_type" : "type-1244",
+   "self_type" : "type-1244",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1222" ],
+   "template_args" : [ "type-1241" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
   },
   {
@@ -25364,11 +25286,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1237",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2222",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1238" ],
+   "template_args" : [ "type-2221" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -25376,17 +25298,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1480"
+     "referenced_type" : "type-1252"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Point>",
    "name" : "android::LightFlattenablePod<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-1482",
-   "self_type" : "type-1482",
+   "referenced_type" : "type-1254",
+   "self_type" : "type-1254",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1481" ],
+   "template_args" : [ "type-1253" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
   },
   {
@@ -25394,17 +25316,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-1244"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
    "name" : "android::LightFlattenablePod<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1243",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1222" ],
+   "template_args" : [ "type-1241" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
   },
   {
@@ -25414,17 +25336,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-1571"
+     "referenced_type" : "type-1343"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::Fence>",
    "name" : "android::LightRefBase<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-1570",
-   "self_type" : "type-1570",
+   "referenced_type" : "type-1342",
+   "self_type" : "type-1342",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-1568" ],
+   "template_args" : [ "type-1340" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
   },
   {
@@ -25434,17 +25356,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-1366"
+     "referenced_type" : "type-1134"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-1365",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1133",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-1363" ],
+   "template_args" : [ "type-1131" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -25454,17 +25376,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-1555"
+     "referenced_type" : "type-1327"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1554",
+   "referenced_type" : "type-1326",
+   "self_type" : "type-1326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-1556" ],
+   "template_args" : [ "type-1328" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -25510,7 +25432,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1365"
+     "referenced_type" : "type-1133"
     }
    ],
    "fields" :
@@ -25519,7 +25441,7 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-1364"
+     "referenced_type" : "type-1132"
     },
     {
      "access" : "private",
@@ -25531,8 +25453,8 @@
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1363",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1131",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
@@ -25542,7 +25464,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1482"
+     "referenced_type" : "type-1254"
     }
    ],
    "fields" :
@@ -25560,8 +25482,8 @@
    "linker_set_key" : "android::Point",
    "name" : "android::Point",
    "record_kind" : "class",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1253",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
    "unique_id" : "_ZTSN7android5PointE"
@@ -25628,17 +25550,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1223"
+     "referenced_type" : "type-1242"
     },
     {
-     "referenced_type" : "type-1224"
+     "referenced_type" : "type-1243"
     }
    ],
    "linker_set_key" : "android::Rect",
    "name" : "android::Rect",
    "record_kind" : "class",
-   "referenced_type" : "type-1222",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1241",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
    "unique_id" : "_ZTSN7android4RectE"
@@ -25709,8 +25631,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1312",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1080",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -25720,8 +25642,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-1308",
-   "self_type" : "type-1308",
+   "referenced_type" : "type-1076",
+   "self_type" : "type-1076",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -25745,7 +25667,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1237"
+     "referenced_type" : "type-2222"
     }
    ],
    "fields" :
@@ -25753,14 +25675,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-1221"
+     "referenced_type" : "type-2213"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2221",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -25778,8 +25700,8 @@
    "linker_set_key" : "android::ScopedTrace",
    "name" : "android::ScopedTrace",
    "record_kind" : "class",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1352",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Trace.h",
    "unique_id" : "_ZTSN7android11ScopedTraceE"
@@ -25789,11 +25711,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferAllocator>",
    "name" : "android::Singleton<android::GraphicBufferAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-779",
-   "self_type" : "type-779",
+   "referenced_type" : "type-541",
+   "self_type" : "type-541",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-780" ],
+   "template_args" : [ "type-542" ],
    "unique_id" : "_ZTSN7android9SingletonINS_22GraphicBufferAllocatorEEE"
   },
   {
@@ -25801,11 +25723,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-769",
-   "self_type" : "type-769",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-766" ],
+   "template_args" : [ "type-527" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -25878,11 +25800,11 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "record_kind" : "class",
-   "referenced_type" : "type-944",
-   "self_type" : "type-944",
+   "referenced_type" : "type-711",
+   "self_type" : "type-711",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-930" ],
+   "template_args" : [ "type-694" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEEEE",
    "vtable_components" :
    [
@@ -26191,11 +26113,11 @@
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2213",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1222" ],
+   "template_args" : [ "type-1241" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -26353,61 +26275,6 @@
      "referenced_type" : "type-235"
     }
    ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-1217",
-   "self_type" : "type-1217",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-285" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-235"
-    }
-   ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
@@ -26521,8 +26388,8 @@
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1649",
-   "self_type" : "type-1649",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1421",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-284" ],
@@ -26649,14 +26516,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1554"
+     "referenced_type" : "type-1326"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1328",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -26683,19 +26550,19 @@
    "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-1060",
-   "self_type" : "type-1060",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-912" ],
+   "template_args" : [ "type-142", "type-676" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-1333",
+   "self_type" : "type-1333",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -26713,11 +26580,11 @@
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
    "record_kind" : "class",
-   "referenced_type" : "type-1569",
-   "self_type" : "type-1569",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1341",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-1561" ],
+   "template_args" : [ "type-1333" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -26725,28 +26592,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-720"
+     "referenced_type" : "type-905"
     },
     {
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-906"
     },
     {
-     "referenced_type" : "type-722"
+     "referenced_type" : "type-907"
     },
     {
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-908"
     },
     {
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-909"
     },
     {
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-910"
     },
     {
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-911"
     },
     {
-     "referenced_type" : "type-727"
+     "referenced_type" : "type-912"
     }
    ],
    "fields" :
@@ -26754,14 +26621,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-719"
+     "referenced_type" : "type-904"
     }
    ],
    "linker_set_key" : "android::details::TMat33<float>",
    "name" : "android::details::TMat33<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-718",
-   "self_type" : "type-718",
+   "referenced_type" : "type-903",
+   "self_type" : "type-903",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h",
    "template_args" : [ "type-10" ],
@@ -26772,28 +26639,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1262"
+     "referenced_type" : "type-2254"
     },
     {
-     "referenced_type" : "type-1263"
+     "referenced_type" : "type-2255"
     },
     {
-     "referenced_type" : "type-1261"
+     "referenced_type" : "type-2252"
     },
     {
-     "referenced_type" : "type-1270"
+     "referenced_type" : "type-2265"
     },
     {
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-2268"
     },
     {
-     "referenced_type" : "type-1273"
+     "referenced_type" : "type-2270"
     },
     {
-     "referenced_type" : "type-1272"
+     "referenced_type" : "type-2269"
     },
     {
-     "referenced_type" : "type-1275"
+     "referenced_type" : "type-2272"
     }
    ],
    "fields" :
@@ -26801,14 +26668,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-1280"
+     "referenced_type" : "type-2277"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -26819,8 +26686,8 @@
    "linker_set_key" : "android::details::TMatDebug<android::details::TMat33, float>",
    "name" : "android::details::TMatDebug<android::details::TMat33, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-912",
+   "self_type" : "type-912",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26831,8 +26698,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-1275",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26843,8 +26710,8 @@
    "linker_set_key" : "android::details::TMatHelpers<android::details::TMat33, float>",
    "name" : "android::details::TMatHelpers<android::details::TMat33, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-911",
+   "self_type" : "type-911",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26855,8 +26722,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-1272",
-   "self_type" : "type-1272",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26867,8 +26734,8 @@
    "linker_set_key" : "android::details::TMatProductOperators<android::details::TMat33, float>",
    "name" : "android::details::TMatProductOperators<android::details::TMat33, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-723",
-   "self_type" : "type-723",
+   "referenced_type" : "type-908",
+   "self_type" : "type-908",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26879,8 +26746,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-1270",
-   "self_type" : "type-1270",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2265",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26891,8 +26758,8 @@
    "linker_set_key" : "android::details::TMatSquareFunctions<android::details::TMat33, float>",
    "name" : "android::details::TMatSquareFunctions<android::details::TMat33, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-724",
-   "self_type" : "type-724",
+   "referenced_type" : "type-909",
+   "self_type" : "type-909",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26903,8 +26770,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-1271",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2268",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26915,8 +26782,8 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat33, float>",
    "name" : "android::details::TMatTransform<android::details::TMat33, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-725",
-   "self_type" : "type-725",
+   "referenced_type" : "type-910",
+   "self_type" : "type-910",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26927,8 +26794,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-1273",
-   "self_type" : "type-1273",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -27113,13 +26980,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-413"
     },
     {
-     "referenced_type" : "type-404"
+     "referenced_type" : "type-414"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-415"
     },
     {
      "referenced_type" : "type-38"
@@ -27134,14 +27001,14 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-411"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<float>",
    "name" : "android::details::TQuaternion<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-400",
-   "self_type" : "type-400",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "template_args" : [ "type-10" ],
@@ -27152,7 +27019,7 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-402"
+     "referenced_type" : "type-412"
     },
     {
      "field_name" : "xyzw",
@@ -27171,8 +27038,8 @@
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_E"
@@ -27204,8 +27071,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-402",
-   "self_type" : "type-402",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_Ut_E"
@@ -27215,22 +27082,22 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-396"
     },
     {
-     "referenced_type" : "type-420"
+     "referenced_type" : "type-427"
     },
     {
-     "referenced_type" : "type-455"
-    },
-    {
-     "referenced_type" : "type-489"
+     "referenced_type" : "type-462"
     },
     {
      "referenced_type" : "type-510"
     },
     {
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-600"
+    },
+    {
+     "referenced_type" : "type-643"
     }
    ],
    "fields" :
@@ -27242,8 +27109,8 @@
    "linker_set_key" : "android::details::TVec2<bool>",
    "name" : "android::details::TVec2<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-1266",
+   "self_type" : "type-1266",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "template_args" : [ "type-6" ],
@@ -28301,8 +28168,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TMat33, float>",
    "name" : "android::details::TVecAddOperators<android::details::TMat33, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-907",
+   "self_type" : "type-907",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28313,8 +28180,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-1261",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2252",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28337,8 +28204,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-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-413",
+   "self_type" : "type-413",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28349,8 +28216,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-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-427",
+   "self_type" : "type-427",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28433,8 +28300,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TMat33, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TMat33, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-906",
+   "self_type" : "type-906",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28445,8 +28312,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-1263",
-   "self_type" : "type-1263",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28469,8 +28336,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-405",
-   "self_type" : "type-405",
+   "referenced_type" : "type-415",
+   "self_type" : "type-415",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28481,8 +28348,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-489",
-   "self_type" : "type-489",
+   "referenced_type" : "type-510",
+   "self_type" : "type-510",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28565,8 +28432,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, bool>",
    "name" : "android::details::TVecDebug<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-643",
+   "self_type" : "type-643",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28649,8 +28516,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, bool>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-600",
+   "self_type" : "type-600",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28733,8 +28600,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-392",
-   "self_type" : "type-392",
+   "referenced_type" : "type-396",
+   "self_type" : "type-396",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28817,8 +28684,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TMat33, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TMat33, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-905",
+   "self_type" : "type-905",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28829,8 +28696,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-1262",
-   "self_type" : "type-1262",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28853,8 +28720,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-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-414",
+   "self_type" : "type-414",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28865,8 +28732,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-455",
-   "self_type" : "type-455",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28987,13 +28854,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-1216"
+     "referenced_type" : "type-1067"
     }
    ],
    "linker_set_key" : "android::half::fp32",
    "name" : "android::half::fp32",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1075",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "unique_id" : "_ZTSN7android4half4fp32E"
@@ -29015,8 +28882,8 @@
    "linker_set_key" : "android::half::fp32::(anonymous union at frameworks/native/libs/math/include/math/half.h:70:9) at frameworks/native/libs/math/include/math/half.h:70:9",
    "name" : "android::half::fp32::(anonymous union at frameworks/native/libs/math/include/math/half.h:70:9) at frameworks/native/libs/math/include/math/half.h:70:9",
    "record_kind" : "union",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1216",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1067",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "unique_id" : "_ZTSN7android4half4fp32Ut_E"
@@ -29304,8 +29171,8 @@
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1333",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1101",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
@@ -29316,7 +29183,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-1317"
+     "referenced_type" : "type-1085"
     },
     {
      "is_virtual" : true,
@@ -29326,8 +29193,8 @@
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-1325",
-   "self_type" : "type-1325",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1093",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -30230,17 +30097,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-636"
+     "referenced_type" : "type-394"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-635",
-   "self_type" : "type-635",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-637" ],
+   "template_args" : [ "type-395" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V3_05ErrorEEE"
   },
   {
@@ -30281,8 +30148,8 @@
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1550",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1322",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-151" ],
@@ -30327,7 +30194,7 @@
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-1413"
+     "referenced_type" : "type-1181"
     },
     {
      "access" : "protected",
@@ -30339,19 +30206,19 @@
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-1414"
+     "referenced_type" : "type-1182"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-1415"
+     "referenced_type" : "type-1183"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -30378,8 +30245,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-1316",
+   "self_type" : "type-1316",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -30388,8 +30255,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-1558",
-   "self_type" : "type-1558",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1330",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -30398,8 +30265,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1332",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -30411,13 +30278,13 @@
     {
      "access" : "private",
      "field_name" : "mBase",
-     "referenced_type" : "type-1336"
+     "referenced_type" : "type-1104"
     }
    ],
    "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10>",
    "name" : "android::hardware::details::const_accessor<unsigned int, 10>",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1335",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-123" ],
@@ -30430,7 +30297,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1332"
+     "referenced_type" : "type-1100"
     },
     {
      "field_name" : "_pad",
@@ -30441,8 +30308,8 @@
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1331",
+   "referenced_type" : "type-1099",
+   "self_type" : "type-1099",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -30453,16 +30320,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1331"
+     "referenced_type" : "type-1099"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1330",
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1098",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1333" ],
+   "template_args" : [ "type-1101" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -30489,13 +30356,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1304"
+     "referenced_type" : "type-1072"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-1303",
-   "self_type" : "type-1303",
+   "referenced_type" : "type-1071",
+   "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-287" ],
@@ -30519,8 +30386,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1304",
-   "self_type" : "type-1304",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1072",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -30597,13 +30464,13 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1383"
+     "referenced_type" : "type-1151"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "template_args" : [ "type-144" ],
@@ -30616,7 +30483,7 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1364"
+     "referenced_type" : "type-1132"
     },
     {
      "field_name" : "_pad",
@@ -30627,8 +30494,8 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1151",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -30679,8 +30546,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-1534",
-   "self_type" : "type-1534",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1306",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -30714,8 +30581,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned int, 10>",
    "name" : "android::hardware::details::std_array<unsigned int, 10>",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1334",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1102",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-123" ],
@@ -30727,7 +30594,7 @@
    [
     {
      "field_name" : "description",
-     "referenced_type" : "type-1340"
+     "referenced_type" : "type-1108"
     },
     {
      "field_name" : "nativeHandle",
@@ -30737,8 +30604,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
    "name" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1193",
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_214HardwareBufferE"
@@ -30750,13 +30617,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1341"
+     "referenced_type" : "type-1109"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10>",
    "name" : "android::hardware::hidl_array<unsigned int, 10>",
-   "referenced_type" : "type-1340",
-   "self_type" : "type-1340",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1108",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "template_args" : [ "type-123" ],
@@ -30773,8 +30640,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1127",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -30875,11 +30742,11 @@
    "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-657",
-   "self_type" : "type-657",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-658", "type-151" ],
+   "template_args" : [ "type-420", "type-151" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_211BufferUsageEvEE"
   },
   {
@@ -30925,13 +30792,13 @@
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-1314"
+     "referenced_type" : "type-1082"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1317",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1085",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -30943,7 +30810,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1303"
+     "referenced_type" : "type-1071"
     },
     {
      "access" : "private",
@@ -30960,8 +30827,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-1314",
-   "self_type" : "type-1314",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1082",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -30973,7 +30840,7 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1330"
+     "referenced_type" : "type-1098"
     },
     {
      "access" : "private",
@@ -30990,11 +30857,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-1097",
+   "self_type" : "type-1097",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1333" ],
+   "template_args" : [ "type-1101" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -31077,8 +30944,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1345",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1113",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -31356,16 +31223,16 @@
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-912"
+     "referenced_type" : "type-676"
     }
    ],
    "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-930",
-   "self_type" : "type-930",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-912" ],
+   "template_args" : [ "type-142", "type-676" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31375,17 +31242,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1586"
+     "referenced_type" : "type-1358"
     }
    ],
    "linker_set_key" : "android::sp<android::Fence>",
    "name" : "android::sp<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1585",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1357",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1568" ],
+   "template_args" : [ "type-1340" ],
    "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
   },
   {
@@ -31395,17 +31262,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-916"
+     "referenced_type" : "type-680"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBuffer>",
    "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-915",
-   "self_type" : "type-915",
+   "referenced_type" : "type-679",
+   "self_type" : "type-679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-764" ],
+   "template_args" : [ "type-525" ],
    "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
@@ -31515,17 +31382,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-485"
     }
    ],
    "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-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-731" ],
+   "template_args" : [ "type-487" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V3_010IAllocatorEEE"
   },
   {
@@ -31575,17 +31442,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-741"
+     "referenced_type" : "type-498"
     }
    ],
    "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-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-497",
+   "self_type" : "type-497",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-743" ],
+   "template_args" : [ "type-500" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
   },
   {
@@ -31595,17 +31462,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1358"
+     "referenced_type" : "type-1126"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1357",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1125",
+   "self_type" : "type-1125",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1359" ],
+   "template_args" : [ "type-1127" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -31652,41 +31519,41 @@
    "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-1056",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-912" ],
+   "template_args" : [ "type-676" ],
    "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-1249",
-   "self_type" : "type-1249",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2234",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1222" ],
+   "template_args" : [ "type-1241" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_4RectEEE"
   },
   {
    "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-1054",
-   "self_type" : "type-1054",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-930" ],
+   "template_args" : [ "type-694" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<const native_handle *>",
    "name" : "android::trait_pointer<const native_handle *>",
-   "referenced_type" : "type-1055",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-818",
+   "self_type" : "type-818",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-142" ],
@@ -31696,8 +31563,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1658",
+   "referenced_type" : "type-1430",
+   "self_type" : "type-1430",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-284" ],
@@ -31707,52 +31574,52 @@
    "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-1049",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-812",
+   "self_type" : "type-812",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-912" ],
+   "template_args" : [ "type-676" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::Point>",
    "name" : "android::trait_trivial_copy<android::Point>",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1516",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1288",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1481" ],
+   "template_args" : [ "type-1253" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_5PointEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::Rect>",
    "name" : "android::trait_trivial_copy<android::Rect>",
-   "referenced_type" : "type-1531",
-   "self_type" : "type-1531",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1303",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-1222" ],
+   "template_args" : [ "type-1241" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_4RectEEE"
   },
   {
    "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-1050",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-930" ],
+   "template_args" : [ "type-694" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -31762,8 +31629,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
+   "referenced_type" : "type-512",
+   "self_type" : "type-512",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-288" ],
@@ -31773,8 +31640,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<const native_handle *>",
    "name" : "android::trait_trivial_copy<const native_handle *>",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-811",
+   "self_type" : "type-811",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-142" ],
@@ -31784,8 +31651,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
+   "referenced_type" : "type-795",
+   "self_type" : "type-795",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-41" ],
@@ -31795,8 +31662,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "type-757",
+   "self_type" : "type-757",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -31806,8 +31673,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
+   "referenced_type" : "type-647",
+   "self_type" : "type-647",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-103" ],
@@ -31817,8 +31684,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
+   "referenced_type" : "type-741",
+   "self_type" : "type-741",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-284" ],
@@ -31828,30 +31695,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-704",
+   "self_type" : "type-704",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-542" ],
+   "template_args" : [ "type-687" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-515",
-   "self_type" : "type-515",
+   "referenced_type" : "type-617",
+   "self_type" : "type-617",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-506" ],
+   "template_args" : [ "type-599" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-540",
+   "self_type" : "type-540",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-218" ],
@@ -31861,8 +31728,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
+   "referenced_type" : "type-675",
+   "self_type" : "type-675",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-123" ],
@@ -31872,8 +31739,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
+   "referenced_type" : "type-751",
+   "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -31883,19 +31750,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
+   "referenced_type" : "type-722",
+   "self_type" : "type-722",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-554" ],
+   "template_args" : [ "type-710" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-521",
-   "self_type" : "type-521",
+   "referenced_type" : "type-631",
+   "self_type" : "type-631",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -31905,8 +31772,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-476",
+   "self_type" : "type-476",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-151" ],
@@ -31916,52 +31783,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_ctor<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1044",
+   "referenced_type" : "type-807",
+   "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-912" ],
+   "template_args" : [ "type-676" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::Point>",
    "name" : "android::trait_trivial_ctor<android::Point>",
-   "referenced_type" : "type-1514",
-   "self_type" : "type-1514",
+   "referenced_type" : "type-1286",
+   "self_type" : "type-1286",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1481" ],
+   "template_args" : [ "type-1253" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_5PointEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::Rect>",
    "name" : "android::trait_trivial_ctor<android::Rect>",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1529",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1301",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-1222" ],
+   "template_args" : [ "type-1241" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_4RectEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-805",
+   "self_type" : "type-805",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-930" ],
+   "template_args" : [ "type-694" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -31971,8 +31838,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
+   "referenced_type" : "type-501",
+   "self_type" : "type-501",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-288" ],
@@ -31982,8 +31849,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<const native_handle *>",
    "name" : "android::trait_trivial_ctor<const native_handle *>",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1043",
+   "referenced_type" : "type-806",
+   "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-142" ],
@@ -31993,8 +31860,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
+   "referenced_type" : "type-781",
+   "self_type" : "type-781",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-41" ],
@@ -32004,8 +31871,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
+   "referenced_type" : "type-753",
+   "self_type" : "type-753",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -32015,8 +31882,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
+   "referenced_type" : "type-638",
+   "self_type" : "type-638",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-103" ],
@@ -32026,8 +31893,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-284" ],
@@ -32037,30 +31904,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-686",
+   "self_type" : "type-686",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-542" ],
+   "template_args" : [ "type-687" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-505",
-   "self_type" : "type-505",
+   "referenced_type" : "type-598",
+   "self_type" : "type-598",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-506" ],
+   "template_args" : [ "type-599" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
+   "referenced_type" : "type-534",
+   "self_type" : "type-534",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-218" ],
@@ -32070,8 +31937,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
+   "referenced_type" : "type-661",
+   "self_type" : "type-661",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-123" ],
@@ -32081,8 +31948,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-746",
+   "self_type" : "type-746",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -32092,19 +31959,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
+   "referenced_type" : "type-709",
+   "self_type" : "type-709",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-554" ],
+   "template_args" : [ "type-710" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -32114,8 +31981,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-151" ],
@@ -32125,52 +31992,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_dtor<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-809",
+   "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-912" ],
+   "template_args" : [ "type-676" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::Point>",
    "name" : "android::trait_trivial_dtor<android::Point>",
-   "referenced_type" : "type-1515",
-   "self_type" : "type-1515",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1287",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1481" ],
+   "template_args" : [ "type-1253" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_5PointEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::Rect>",
    "name" : "android::trait_trivial_dtor<android::Rect>",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1530",
+   "referenced_type" : "type-1302",
+   "self_type" : "type-1302",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-1222" ],
+   "template_args" : [ "type-1241" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_4RectEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-1047",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-810",
+   "self_type" : "type-810",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-930" ],
+   "template_args" : [ "type-694" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-482",
+   "self_type" : "type-482",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -32180,8 +32047,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-511",
+   "self_type" : "type-511",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-288" ],
@@ -32191,8 +32058,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<const native_handle *>",
    "name" : "android::trait_trivial_dtor<const native_handle *>",
-   "referenced_type" : "type-1045",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-808",
+   "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-142" ],
@@ -32202,8 +32069,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-610",
-   "self_type" : "type-610",
+   "referenced_type" : "type-786",
+   "self_type" : "type-786",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-41" ],
@@ -32213,8 +32080,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "referenced_type" : "type-754",
+   "self_type" : "type-754",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -32224,8 +32091,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-644",
+   "self_type" : "type-644",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-103" ],
@@ -32235,8 +32102,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "referenced_type" : "type-738",
+   "self_type" : "type-738",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-284" ],
@@ -32246,30 +32113,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
+   "referenced_type" : "type-692",
+   "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-542" ],
+   "template_args" : [ "type-687" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
+   "referenced_type" : "type-610",
+   "self_type" : "type-610",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-506" ],
+   "template_args" : [ "type-599" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-499",
-   "self_type" : "type-499",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-218" ],
@@ -32279,8 +32146,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-668",
+   "self_type" : "type-668",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-123" ],
@@ -32290,8 +32157,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
+   "referenced_type" : "type-749",
+   "self_type" : "type-749",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -32301,19 +32168,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
+   "referenced_type" : "type-719",
+   "self_type" : "type-719",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-554" ],
+   "template_args" : [ "type-710" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
+   "referenced_type" : "type-625",
+   "self_type" : "type-625",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -32323,8 +32190,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-469",
+   "self_type" : "type-469",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-151" ],
@@ -32334,33 +32201,33 @@
    "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-1052",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-912" ],
+   "template_args" : [ "type-676" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::Point>",
    "name" : "android::trait_trivial_move<android::Point>",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1517",
+   "referenced_type" : "type-1289",
+   "self_type" : "type-1289",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1481" ],
+   "template_args" : [ "type-1253" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_5PointEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::Rect>",
    "name" : "android::trait_trivial_move<android::Rect>",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1532",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1304",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-1222" ],
+   "template_args" : [ "type-1241" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_4RectEEE"
   },
   {
@@ -32378,8 +32245,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String8>",
    "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
+   "referenced_type" : "type-902",
+   "self_type" : "type-902",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "template_args" : [ "type-285" ],
@@ -32389,19 +32256,19 @@
    "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-1053",
-   "self_type" : "type-1053",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-930" ],
+   "template_args" : [ "type-694" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "type-490",
+   "self_type" : "type-490",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -32411,8 +32278,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "type-533",
+   "self_type" : "type-533",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-288" ],
@@ -32422,8 +32289,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<const native_handle *>",
    "name" : "android::trait_trivial_move<const native_handle *>",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-142" ],
@@ -32433,8 +32300,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-798",
+   "self_type" : "type-798",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-41" ],
@@ -32444,8 +32311,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
+   "referenced_type" : "type-758",
+   "self_type" : "type-758",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -32455,8 +32322,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-650",
+   "self_type" : "type-650",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-103" ],
@@ -32466,8 +32333,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
+   "referenced_type" : "type-742",
+   "self_type" : "type-742",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-284" ],
@@ -32477,30 +32344,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-708",
+   "self_type" : "type-708",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-542" ],
+   "template_args" : [ "type-687" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-618",
+   "self_type" : "type-618",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-506" ],
+   "template_args" : [ "type-599" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-577",
+   "self_type" : "type-577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-218" ],
@@ -32510,8 +32377,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-537",
-   "self_type" : "type-537",
+   "referenced_type" : "type-682",
+   "self_type" : "type-682",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-123" ],
@@ -32521,8 +32388,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
+   "referenced_type" : "type-752",
+   "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-124" ],
@@ -32532,19 +32399,19 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-728",
+   "self_type" : "type-728",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-554" ],
+   "template_args" : [ "type-710" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
+   "referenced_type" : "type-635",
+   "self_type" : "type-635",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -32554,8 +32421,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-151" ],
@@ -32565,41 +32432,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-1059",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-823",
+   "self_type" : "type-823",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-912" ],
+   "template_args" : [ "type-676" ],
    "unique_id" : "_ZTSN7android6traitsINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-1250",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1222" ],
+   "template_args" : [ "type-1241" ],
    "unique_id" : "_ZTSN7android6traitsINS_4RectEEE"
   },
   {
    "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-1057",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-930" ],
+   "template_args" : [ "type-694" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<const native_handle *>",
    "name" : "android::traits<const native_handle *>",
-   "referenced_type" : "type-1058",
-   "self_type" : "type-1058",
+   "referenced_type" : "type-822",
+   "self_type" : "type-822",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-142" ],
@@ -32609,8 +32476,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1659",
-   "self_type" : "type-1659",
+   "referenced_type" : "type-1431",
+   "self_type" : "type-1431",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-284" ],
@@ -32632,8 +32499,8 @@
    ],
    "linker_set_key" : "android::ui::Size",
    "name" : "android::ui::Size",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1519",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1291",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h",
    "unique_id" : "_ZTSN7android2ui4SizeE"
@@ -32645,7 +32512,7 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-1287"
+     "referenced_type" : "type-2284"
     },
     {
      "access" : "private",
@@ -32657,8 +32524,8 @@
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-1286",
-   "self_type" : "type-1286",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -32670,13 +32537,13 @@
    [
     {
      "field_name" : "v",
-     "referenced_type" : "type-719"
+     "referenced_type" : "type-904"
     }
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -32686,16 +32553,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1252"
+     "referenced_type" : "type-2209"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-1251",
-   "self_type" : "type-1251",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1222" ],
+   "template_args" : [ "type-1241" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_4RectEEE"
   },
   {
@@ -32703,16 +32570,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-701"
     }
    ],
    "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-936",
-   "self_type" : "type-936",
+   "referenced_type" : "type-700",
+   "self_type" : "type-700",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-930" ],
+   "template_args" : [ "type-694" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEEEE"
   },
   {
@@ -32720,13 +32587,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1645"
+     "referenced_type" : "type-1417"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1644",
-   "self_type" : "type-1644",
+   "referenced_type" : "type-1416",
+   "self_type" : "type-1416",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-284" ],
@@ -32748,8 +32615,8 @@
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1466",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1234",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -32770,13 +32637,13 @@
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1231"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1462",
+   "referenced_type" : "type-1230",
+   "self_type" : "type-1230",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -32787,7 +32654,7 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1227"
     },
     {
      "field_name" : "num_planes",
@@ -32797,13 +32664,13 @@
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1229"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1228",
+   "self_type" : "type-1228",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -32819,7 +32686,7 @@
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1225"
     },
     {
      "field_name" : "bits_per_component",
@@ -32854,8 +32721,8 @@
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1458",
+   "referenced_type" : "type-1226",
+   "self_type" : "type-1226",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -32876,23 +32743,23 @@
     {
      "field_name" : "reserved",
      "field_offset" : 64,
-     "referenced_type" : "type-758"
+     "referenced_type" : "type-519"
     },
     {
      "field_name" : "incRef",
      "field_offset" : 192,
-     "referenced_type" : "type-759"
+     "referenced_type" : "type-520"
     },
     {
      "field_name" : "decRef",
      "field_offset" : 224,
-     "referenced_type" : "type-759"
+     "referenced_type" : "type-520"
     }
    ],
    "linker_set_key" : "android_native_base_t",
    "name" : "android_native_base_t",
-   "referenced_type" : "type-757",
-   "self_type" : "type-757",
+   "referenced_type" : "type-518",
+   "self_type" : "type-518",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_base_t"
@@ -32923,8 +32790,8 @@
    ],
    "linker_set_key" : "android_native_rect_t",
    "name" : "android_native_rect_t",
-   "referenced_type" : "type-855",
-   "self_type" : "type-855",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_rect_t"
@@ -32935,22 +32802,22 @@
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1232"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1232"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1232"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1232"
     },
     {
      "field_name" : "maxLuminance",
@@ -32965,8 +32832,8 @@
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-1465",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-1233",
+   "self_type" : "type-1233",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -32987,8 +32854,8 @@
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-1464",
-   "self_type" : "type-1464",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1232",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -33046,7 +32913,7 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-785"
+     "referenced_type" : "type-547"
     },
     {
      "field_name" : "flags",
@@ -33066,88 +32933,88 @@
     {
      "field_name" : "stride",
      "field_offset" : 608,
-     "referenced_type" : "type-647"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "format",
      "field_offset" : 640,
-     "referenced_type" : "type-647"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "xdpi",
      "field_offset" : 672,
-     "referenced_type" : "type-800"
+     "referenced_type" : "type-563"
     },
     {
      "field_name" : "ydpi",
      "field_offset" : 704,
-     "referenced_type" : "type-800"
+     "referenced_type" : "type-563"
     },
     {
      "field_name" : "fps",
      "field_offset" : 736,
-     "referenced_type" : "type-800"
+     "referenced_type" : "type-563"
     },
     {
      "field_name" : "minSwapInterval",
      "field_offset" : 768,
-     "referenced_type" : "type-647"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "maxSwapInterval",
      "field_offset" : 800,
-     "referenced_type" : "type-647"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "numFramebuffers",
      "field_offset" : 832,
-     "referenced_type" : "type-647"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 864,
-     "referenced_type" : "type-801"
+     "referenced_type" : "type-564"
     },
     {
      "field_name" : "setSwapInterval",
      "field_offset" : 1088,
-     "referenced_type" : "type-802"
+     "referenced_type" : "type-565"
     },
     {
      "field_name" : "setUpdateRect",
      "field_offset" : 1120,
-     "referenced_type" : "type-805"
+     "referenced_type" : "type-568"
     },
     {
      "field_name" : "post",
      "field_offset" : 1152,
-     "referenced_type" : "type-807"
+     "referenced_type" : "type-570"
     },
     {
      "field_name" : "compositionComplete",
      "field_offset" : 1184,
-     "referenced_type" : "type-809"
+     "referenced_type" : "type-572"
     },
     {
      "field_name" : "dump",
      "field_offset" : 1216,
-     "referenced_type" : "type-811"
+     "referenced_type" : "type-574"
     },
     {
      "field_name" : "enableScreen",
      "field_offset" : 1248,
-     "referenced_type" : "type-802"
+     "referenced_type" : "type-565"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1280,
-     "referenced_type" : "type-763"
+     "referenced_type" : "type-524"
     }
    ],
    "linker_set_key" : "framebuffer_device_t",
    "name" : "framebuffer_device_t",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 184,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h",
    "unique_id" : "framebuffer_device_t"
@@ -33158,63 +33025,63 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-787"
+     "referenced_type" : "type-549"
     },
     {
      "field_name" : "registerBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-816"
+     "referenced_type" : "type-579"
     },
     {
      "field_name" : "unregisterBuffer",
      "field_offset" : 1056,
-     "referenced_type" : "type-816"
+     "referenced_type" : "type-579"
     },
     {
      "field_name" : "lock",
      "field_offset" : 1088,
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-583"
     },
     {
      "field_name" : "unlock",
      "field_offset" : 1120,
-     "referenced_type" : "type-816"
+     "referenced_type" : "type-579"
     },
     {
      "field_name" : "perform",
      "field_offset" : 1152,
-     "referenced_type" : "type-822"
+     "referenced_type" : "type-585"
     },
     {
      "field_name" : "lock_ycbcr",
      "field_offset" : 1184,
-     "referenced_type" : "type-824"
+     "referenced_type" : "type-587"
     },
     {
      "field_name" : "lockAsync",
      "field_offset" : 1216,
-     "referenced_type" : "type-826"
+     "referenced_type" : "type-589"
     },
     {
      "field_name" : "unlockAsync",
      "field_offset" : 1248,
-     "referenced_type" : "type-828"
+     "referenced_type" : "type-591"
     },
     {
      "field_name" : "lockAsync_ycbcr",
      "field_offset" : 1280,
-     "referenced_type" : "type-831"
+     "referenced_type" : "type-594"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1312,
-     "referenced_type" : "type-833"
+     "referenced_type" : "type-596"
     }
    ],
    "linker_set_key" : "gralloc_module_t",
    "name" : "gralloc_module_t",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
    "unique_id" : "gralloc_module_t"
@@ -33235,23 +33102,23 @@
     {
      "field_name" : "module",
      "field_offset" : 64,
-     "referenced_type" : "type-786"
+     "referenced_type" : "type-548"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 96,
-     "referenced_type" : "type-797"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "close",
      "field_offset" : 480,
-     "referenced_type" : "type-798"
+     "referenced_type" : "type-560"
     }
    ],
    "linker_set_key" : "hw_device_t",
    "name" : "hw_device_t",
-   "referenced_type" : "type-785",
-   "self_type" : "type-785",
+   "referenced_type" : "type-547",
+   "self_type" : "type-547",
    "size" : 64,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_device_t"
@@ -33262,13 +33129,13 @@
    [
     {
      "field_name" : "open",
-     "referenced_type" : "type-790"
+     "referenced_type" : "type-552"
     }
    ],
    "linker_set_key" : "hw_module_methods_t",
    "name" : "hw_module_methods_t",
-   "referenced_type" : "type-789",
-   "self_type" : "type-789",
+   "referenced_type" : "type-551",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_methods_t"
@@ -33309,7 +33176,7 @@
     {
      "field_name" : "methods",
      "field_offset" : 160,
-     "referenced_type" : "type-788"
+     "referenced_type" : "type-550"
     },
     {
      "field_name" : "dso",
@@ -33319,13 +33186,13 @@
     {
      "field_name" : "reserved",
      "field_offset" : 224,
-     "referenced_type" : "type-796"
+     "referenced_type" : "type-558"
     }
    ],
    "linker_set_key" : "hw_module_t",
    "name" : "hw_module_t",
-   "referenced_type" : "type-787",
-   "self_type" : "type-787",
+   "referenced_type" : "type-549",
+   "self_type" : "type-549",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_t"
@@ -33335,13 +33202,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-1497"
+     "referenced_type" : "type-1269"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-1496",
-   "self_type" : "type-1496",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1268",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -33352,35 +33219,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-1498"
+     "referenced_type" : "type-1270"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1495"
+     "referenced_type" : "type-1267"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1495"
+     "referenced_type" : "type-1267"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-1491"
+     "referenced_type" : "type-1263"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-1490"
+     "referenced_type" : "type-1262"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-1488"
+     "referenced_type" : "type-1260"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
    "name" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3) at system/core/liblog/include_vndk/log/log_read.h:139:3",
    "record_kind" : "union",
-   "referenced_type" : "type-1497",
-   "self_type" : "type-1497",
+   "referenced_type" : "type-1269",
+   "self_type" : "type-1269",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg::(anonymous union at system/core/liblog/include_vndk/log/log_read.h:139:3)"
@@ -33401,8 +33268,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1487",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1259",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -33443,13 +33310,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-1489"
+     "referenced_type" : "type-1261"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-1260",
+   "self_type" : "type-1260",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -33495,13 +33362,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-1489"
+     "referenced_type" : "type-1261"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1490",
+   "referenced_type" : "type-1262",
+   "self_type" : "type-1262",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -33547,13 +33414,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-1489"
+     "referenced_type" : "type-1261"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1491",
+   "referenced_type" : "type-1263",
+   "self_type" : "type-1263",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -33604,13 +33471,13 @@
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-1489"
+     "referenced_type" : "type-1261"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-1267",
+   "self_type" : "type-1267",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -33669,8 +33536,8 @@
    "linker_set_key" : "std::numeric_limits<android::half>",
    "name" : "std::numeric_limits<android::half>",
    "record_kind" : "class",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
+   "referenced_type" : "type-597",
+   "self_type" : "type-597",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -33683,8 +33550,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &&",
    "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1614",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -33692,8 +33559,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::HdrCapabilities &&",
    "name" : "android::HdrCapabilities &&",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-964",
+   "self_type" : "type-970",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -33701,8 +33568,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
-   "referenced_type" : "type-1569",
-   "self_type" : "type-1592",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -33719,8 +33586,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-635",
-   "self_type" : "type-640",
+   "referenced_type" : "type-393",
+   "self_type" : "type-399",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33737,8 +33604,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1324",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33747,7 +33614,7 @@
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
    "referenced_type" : "type-102",
-   "self_type" : "type-1540",
+   "self_type" : "type-1312",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33756,7 +33623,7 @@
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
    "referenced_type" : "type-101",
-   "self_type" : "type-1546",
+   "self_type" : "type-1318",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33765,7 +33632,7 @@
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
    "referenced_type" : "type-139",
-   "self_type" : "type-1319",
+   "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -33773,8 +33640,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1323",
+   "referenced_type" : "type-1085",
+   "self_type" : "type-1091",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -33782,8 +33649,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1638",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33800,8 +33667,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-728",
-   "self_type" : "type-734",
+   "referenced_type" : "type-484",
+   "self_type" : "type-491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33827,8 +33694,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-740",
-   "self_type" : "type-746",
+   "referenced_type" : "type-497",
+   "self_type" : "type-504",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33837,7 +33704,7 @@
    "linker_set_key" : "int &&",
    "name" : "int &&",
    "referenced_type" : "type-103",
-   "self_type" : "type-1522",
+   "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
   }
diff --git a/Q/64/x86/source-based/libstagefright_bufferpool@2.0.so.lsdump b/Q/64/x86/source-based/libstagefright_bufferpool@2.0.so.lsdump
index b23246a..a7d8cc3 100644
--- a/Q/64/x86/source-based/libstagefright_bufferpool@2.0.so.lsdump
+++ b/Q/64/x86/source-based/libstagefright_bufferpool@2.0.so.lsdump
@@ -188,10 +188,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2EjP13native_handlejb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEaSERKS7_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2EjP13native_handlejb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEaSERKS7_"
   },
   {
@@ -204,10 +220,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE17unmapGrantorDescrEPvj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE4readEPS5_j"
   },
   {
@@ -236,10 +248,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE17unmapGrantorDescrEPvj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE4readEPS5_j"
   },
   {
@@ -1676,6 +1684,54 @@
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-268"
+    },
+    {
+     "referenced_type" : "type-272"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2EjP13native_handlejb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-268"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-87"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
    "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::operator=",
    "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEaSERKS7_",
    "parameters" :
@@ -1692,6 +1748,54 @@
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
   },
   {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-277"
+    },
+    {
+     "referenced_type" : "type-272"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2EjP13native_handlejb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-277"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-87"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
    "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::operator=",
    "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEaSERKS7_",
    "parameters" :
@@ -1742,26 +1846,6 @@
    "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::unmapGrantorDescr",
-   "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE17unmapGrantorDescrEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-444"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-13"
-    }
-   ],
-   "return_type" : "type-70",
-   "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
-  },
-  {
    "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::read",
    "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE4readEPS5_j",
    "parameters" :
@@ -1887,26 +1971,6 @@
    "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::unmapGrantorDescr",
-   "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE17unmapGrantorDescrEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-445"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-13"
-    }
-   ],
-   "return_type" : "type-70",
-   "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
-  },
-  {
    "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::read",
    "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE4readEPS5_j",
    "parameters" :
@@ -7026,8 +7090,8 @@
     }
    ],
    "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-10",
    "self_type" : "type-10",
@@ -7086,8 +7150,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-228",
    "self_type" : "type-228",
@@ -7128,8 +7192,8 @@
     }
    ],
    "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-223",
    "self_type" : "type-223",
@@ -7170,8 +7234,8 @@
     }
    ],
    "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-264",
    "self_type" : "type-264",
diff --git a/Q/64/x86/source-based/libui.so.lsdump b/Q/64/x86/source-based/libui.so.lsdump
index 17ccc10..ba6360c 100644
--- a/Q/64/x86/source-based/libui.so.lsdump
+++ b/Q/64/x86/source-based/libui.so.lsdump
@@ -24,7 +24,7 @@
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
    "referenced_type" : "type-200",
-   "self_type" : "type-2438",
+   "self_type" : "type-2428",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -1178,6 +1178,9 @@
    "name" : "_ZNK7android17Gralloc3Allocator8isLoadedEv"
   },
   {
+   "name" : "_ZNK7android22GraphicBufferAllocator12getTotalSizeEv"
+  },
+  {
    "name" : "_ZNK7android22GraphicBufferAllocator4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
   },
   {
@@ -2193,8 +2196,8 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "underlying_type" : "type-123",
@@ -4430,8 +4433,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2449",
-   "self_type" : "type-2449",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "underlying_type" : "type-123",
@@ -4464,8 +4467,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2450",
-   "self_type" : "type-2450",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "underlying_type" : "type-123",
@@ -7934,7 +7937,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2458"
+     "referenced_type" : "type-2448"
     }
    ],
    "return_type" : "type-151",
@@ -8091,7 +8094,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
      "referenced_type" : "type-10"
@@ -8110,7 +8113,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
      "referenced_type" : "type-10"
@@ -8135,7 +8138,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
      "referenced_type" : "type-123"
@@ -8157,7 +8160,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     }
    ],
    "return_type" : "type-151",
@@ -8196,10 +8199,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2438"
     }
    ],
    "return_type" : "type-151",
@@ -8212,7 +8215,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
      "referenced_type" : "type-123"
@@ -8228,7 +8231,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     }
    ],
    "return_type" : "type-151",
@@ -8241,10 +8244,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2438"
     }
    ],
    "return_type" : "type-151",
@@ -8257,7 +8260,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
      "referenced_type" : "type-123"
@@ -8273,7 +8276,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     }
    ],
    "return_type" : "type-151",
@@ -8286,7 +8289,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     }
    ],
    "return_type" : "type-151",
@@ -8299,7 +8302,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     }
    ],
    "return_type" : "type-151",
@@ -8312,13 +8315,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-2452",
+   "return_type" : "type-2442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8561,13 +8564,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8577,13 +8580,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8593,10 +8596,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -8605,7 +8608,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8616,7 +8619,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
@@ -8625,7 +8628,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8636,10 +8639,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -8651,7 +8654,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8662,16 +8665,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8681,7 +8684,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-103"
@@ -8690,7 +8693,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8700,10 +8703,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8713,7 +8716,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-103"
@@ -8741,10 +8744,10 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
@@ -8763,10 +8766,10 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
@@ -8791,13 +8794,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-151",
@@ -8813,13 +8816,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -8837,10 +8840,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2397",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8850,7 +8853,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
@@ -8866,7 +8869,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-103"
@@ -8885,7 +8888,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-123"
@@ -8904,7 +8907,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     }
    ],
    "return_type" : "type-151",
@@ -8917,13 +8920,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8933,13 +8936,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8949,10 +8952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -8961,7 +8964,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8971,13 +8974,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8987,13 +8990,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9003,10 +9006,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -9015,7 +9018,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9025,13 +9028,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9041,13 +9044,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9057,10 +9060,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -9069,7 +9072,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9079,7 +9082,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-286"
@@ -9099,7 +9102,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-10"
@@ -9108,7 +9111,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9118,10 +9121,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -9140,7 +9143,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -9159,7 +9162,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1119"
@@ -9178,7 +9181,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
@@ -9194,10 +9197,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-151",
@@ -9210,7 +9213,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     }
    ],
    "return_type" : "type-151",
@@ -9223,7 +9226,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
@@ -9239,10 +9242,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-151",
@@ -9255,7 +9258,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     }
    ],
    "return_type" : "type-151",
@@ -9268,7 +9271,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     }
    ],
    "return_type" : "type-151",
@@ -9281,7 +9284,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     }
    ],
    "return_type" : "type-151",
@@ -9294,13 +9297,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10248,6 +10251,19 @@
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
+   "function_name" : "android::GraphicBufferAllocator::getTotalSize",
+   "linker_set_key" : "_ZNK7android22GraphicBufferAllocator12getTotalSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-721"
+    }
+   ],
+   "return_type" : "type-123",
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
+  },
+  {
    "function_name" : "android::GraphicBufferAllocator::dump",
    "linker_set_key" : "_ZNK7android22GraphicBufferAllocator4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE",
    "parameters" :
@@ -10270,7 +10286,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-103"
@@ -10289,7 +10305,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-6",
@@ -10302,7 +10318,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-123",
@@ -10315,7 +10331,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-10",
@@ -10328,7 +10344,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-10",
@@ -10341,7 +10357,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-10",
@@ -10354,7 +10370,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-10",
@@ -10367,7 +10383,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-286"
@@ -10383,10 +10399,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
-     "referenced_type" : "type-2453"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-286"
@@ -10403,7 +10419,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-123",
@@ -10416,7 +10432,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-123",
@@ -10429,10 +10445,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-2444",
+   "return_type" : "type-2434",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10442,10 +10458,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-2437",
+   "return_type" : "type-2427",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10455,7 +10471,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-1246"
@@ -10475,13 +10491,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2397",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10491,7 +10507,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-1050"
@@ -10507,7 +10523,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-1054"
@@ -10523,7 +10539,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-1280"
@@ -10539,7 +10555,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-103"
@@ -10558,7 +10574,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-123"
@@ -10574,13 +10590,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-2444",
+   "return_type" : "type-2434",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10772,13 +10788,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10788,13 +10804,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10804,10 +10820,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -10816,7 +10832,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10826,7 +10842,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     }
    ],
    "return_type" : "type-123",
@@ -10839,10 +10855,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-6",
@@ -10855,7 +10871,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     }
    ],
    "return_type" : "type-1299",
@@ -10868,7 +10884,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-286"
@@ -10888,10 +10904,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-286"
@@ -10911,7 +10927,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     }
    ],
    "return_type" : "type-1299",
@@ -10924,13 +10940,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10940,13 +10956,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10956,10 +10972,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -10968,7 +10984,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10978,7 +10994,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-227"
@@ -10997,7 +11013,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1284"
@@ -11013,7 +11029,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-103"
@@ -11032,7 +11048,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-122"
@@ -11048,13 +11064,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11064,13 +11080,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11080,10 +11096,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -11092,7 +11108,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11102,13 +11118,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11118,13 +11134,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11134,10 +11150,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -11146,7 +11162,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11157,7 +11173,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
@@ -11166,7 +11182,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11177,10 +11193,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -11192,7 +11208,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11203,16 +11219,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11222,7 +11238,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-103"
@@ -11231,7 +11247,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11242,7 +11258,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-227"
@@ -11262,7 +11278,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-227"
@@ -11282,7 +11298,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-227"
@@ -11305,7 +11321,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-227"
@@ -11328,7 +11344,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-227"
@@ -11351,7 +11367,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-227"
@@ -11506,7 +11522,7 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2401",
+   "referenced_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11631,8 +11647,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2404",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11658,8 +11674,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2386",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11676,8 +11692,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2433",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11946,8 +11962,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2452",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -11984,8 +12000,8 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2418",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2408",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -12005,8 +12021,8 @@
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2426",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12164,8 +12180,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2401",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2388",
+   "self_type" : "type-2392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12191,8 +12207,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2386",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12209,8 +12225,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12434,8 +12450,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2447",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2438",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12490,8 +12506,8 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2414",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -12606,8 +12622,8 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2483",
+   "referenced_type" : "type-2471",
+   "self_type" : "type-2473",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12807,8 +12823,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2672",
-   "self_type" : "type-2679",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2669",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12951,8 +12967,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2575",
-   "self_type" : "type-2574",
+   "referenced_type" : "type-2565",
+   "self_type" : "type-2564",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13122,8 +13138,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-2426",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2415",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13149,8 +13165,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-2407",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2395",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13158,8 +13174,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-2454",
-   "self_type" : "type-2453",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2443",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13167,8 +13183,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-2459",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13278,8 +13294,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2641",
-   "self_type" : "type-2640",
+   "referenced_type" : "type-2631",
+   "self_type" : "type-2630",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13287,8 +13303,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-2653",
+   "self_type" : "type-2652",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13332,8 +13348,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2631",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2621",
+   "self_type" : "type-2620",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13341,8 +13357,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2687",
+   "referenced_type" : "type-2678",
+   "self_type" : "type-2677",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13366,24 +13382,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::CallStack *",
-   "name" : "android::CallStack *",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2391",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::CallStack::StackDeleter *",
-   "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-2394",
-   "self_type" : "type-2395",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-979",
@@ -13585,7 +13583,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2400",
+   "self_type" : "type-2399",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13836,8 +13834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2467",
-   "self_type" : "type-2466",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13845,8 +13843,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2633",
-   "self_type" : "type-2632",
+   "referenced_type" : "type-2623",
+   "self_type" : "type-2622",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13854,8 +13852,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2658",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2648",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13935,8 +13933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2402",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13989,17 +13987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2385",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14043,8 +14032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2430",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14061,8 +14050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2422",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14880,8 +14869,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2436",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14889,8 +14878,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2457",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2447",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14986,15 +14975,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::CallStack *",
-   "name" : "const android::CallStack *",
-   "referenced_type" : "type-2392",
-   "self_type" : "type-2393",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace *",
    "name" : "const android::ColorSpace *",
    "referenced_type" : "type-1039",
@@ -15123,8 +15103,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15177,8 +15157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2401",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2388",
+   "self_type" : "type-2394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15213,17 +15193,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2386",
-   "self_type" : "type-2389",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::String8> *",
-   "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15735,8 +15706,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2447",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2441",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15744,8 +15715,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2455",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2445",
+   "self_type" : "type-2446",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16360,8 +16331,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2466",
-   "self_type" : "type-2465",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2455",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16370,8 +16341,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2632",
-   "self_type" : "type-2634",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16380,8 +16351,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2658",
-   "self_type" : "type-2660",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2650",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16483,8 +16454,8 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -16533,8 +16504,8 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2425",
+   "self_type" : "type-2424",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -16556,16 +16527,6 @@
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CallStack",
-   "name" : "const android::CallStack",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2392",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::ColorSpace",
@@ -16811,7 +16772,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2398",
+   "self_type" : "type-2397",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16870,8 +16831,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2388",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16910,18 +16871,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2386",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::String8>",
-   "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2384",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16970,8 +16921,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2431",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -17760,8 +17711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2437",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17770,8 +17721,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2455",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2445",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17853,8 +17804,8 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2412",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17995,8 +17946,8 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2482",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2471",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18250,8 +18201,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-2520",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2510",
+   "self_type" : "type-2509",
    "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"
   },
@@ -18440,8 +18391,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-2526",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2515",
    "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"
   },
@@ -18620,8 +18571,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-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
    "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"
   },
@@ -18790,8 +18741,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-2524",
-   "self_type" : "type-2523",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
    "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"
   },
@@ -18980,8 +18931,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-2530",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "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"
   },
@@ -19150,8 +19101,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-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2508",
+   "self_type" : "type-2507",
    "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"
   },
@@ -19330,8 +19281,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-2522",
-   "self_type" : "type-2521",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2511",
    "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"
   },
@@ -19520,8 +19471,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-2538",
-   "self_type" : "type-2537",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2527",
    "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"
   },
@@ -19700,8 +19651,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-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "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"
   },
@@ -19880,8 +19831,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-2540",
-   "self_type" : "type-2539",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "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"
   },
@@ -20060,8 +20011,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-2536",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2525",
    "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"
   },
@@ -20240,8 +20191,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-2544",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "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"
   },
@@ -20390,8 +20341,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-2556",
-   "self_type" : "type-2555",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2545",
    "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"
   },
@@ -20520,8 +20471,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-2554",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
    "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"
   },
@@ -20650,8 +20601,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-2552",
-   "self_type" : "type-2551",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
    "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"
   },
@@ -20780,8 +20731,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-2550",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2540",
+   "self_type" : "type-2539",
    "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"
   },
@@ -20910,8 +20861,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-2558",
-   "self_type" : "type-2557",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2547",
    "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"
   },
@@ -21120,8 +21071,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2402",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21160,8 +21111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2404",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21230,8 +21181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2663",
+   "self_type" : "type-2662",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21390,8 +21341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2576",
-   "self_type" : "type-2575",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2565",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21835,35 +21786,6 @@
    ]
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFrameLines",
-     "referenced_type" : "type-2380"
-    }
-   ],
-   "linker_set_key" : "android::CallStack",
-   "name" : "android::CallStack",
-   "record_kind" : "class",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStackE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CallStack::StackDeleter",
-   "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-2394",
-   "self_type" : "type-2394",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
@@ -22802,11 +22724,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2396",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2390",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2397" ],
+   "template_args" : [ "type-2389" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -23183,7 +23105,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2396"
+     "referenced_type" : "type-2390"
     }
    ],
    "fields" :
@@ -23191,14 +23113,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2384"
+     "referenced_type" : "type-2382"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2389",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -23629,8 +23551,8 @@
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2382",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -23791,61 +23713,6 @@
      "referenced_type" : "type-235"
     }
    ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2380",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-285" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-235"
-    }
-   ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
@@ -24210,28 +24077,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2410"
     },
     {
-     "referenced_type" : "type-2421"
+     "referenced_type" : "type-2411"
+    },
+    {
+     "referenced_type" : "type-2409"
+    },
+    {
+     "referenced_type" : "type-2417"
     },
     {
      "referenced_type" : "type-2419"
     },
     {
-     "referenced_type" : "type-2428"
+     "referenced_type" : "type-2421"
     },
     {
-     "referenced_type" : "type-2429"
+     "referenced_type" : "type-2420"
     },
     {
-     "referenced_type" : "type-2431"
-    },
-    {
-     "referenced_type" : "type-2430"
-    },
-    {
-     "referenced_type" : "type-2433"
+     "referenced_type" : "type-2423"
     }
    ],
    "fields" :
@@ -24239,14 +24106,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2428"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2427",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -24269,8 +24136,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-2433",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24293,8 +24160,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-2430",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24317,8 +24184,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-2428",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2417",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24341,8 +24208,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-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24365,8 +24232,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-2431",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25751,8 +25618,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-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2409",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25883,8 +25750,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-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26267,8 +26134,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-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2410",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -29101,8 +28968,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2408",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30014,8 +29881,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2401",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30083,7 +29950,7 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2445"
+     "referenced_type" : "type-2435"
     },
     {
      "access" : "private",
@@ -30095,8 +29962,8 @@
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2444",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -30113,8 +29980,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2445",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -30124,13 +29991,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2411"
+     "referenced_type" : "type-2381"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2380",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
diff --git a/Q/64/x86_64/source-based/libstagefright_bufferpool@2.0.so.lsdump b/Q/64/x86_64/source-based/libstagefright_bufferpool@2.0.so.lsdump
index 1627827..063fd2f 100644
--- a/Q/64/x86_64/source-based/libstagefright_bufferpool@2.0.so.lsdump
+++ b/Q/64/x86_64/source-based/libstagefright_bufferpool@2.0.so.lsdump
@@ -192,6 +192,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2EmP13native_handlemb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEaSERKS7_"
   },
   {
@@ -200,6 +204,10 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2EmP13native_handlemb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEaSERKS7_"
   },
   {
@@ -212,10 +220,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE17unmapGrantorDescrEPvj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE4readEPS5_m"
   },
   {
@@ -244,10 +248,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE17unmapGrantorDescrEPvj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE4readEPS5_m"
   },
   {
@@ -1006,7 +1006,34 @@
    "name" : "_ZTv0_n24_N7android8hardware5media10bufferpool4V2_014implementation8ObserverD1Ev"
   },
   {
+   "name" : "__cmptf2"
+  },
+  {
+   "name" : "__eqtf2"
+  },
+  {
+   "name" : "__floatditf"
+  },
+  {
+   "name" : "__getf2"
+  },
+  {
+   "name" : "__gttf2"
+  },
+  {
+   "name" : "__letf2"
+  },
+  {
+   "name" : "__lttf2"
+  },
+  {
    "name" : "__multf3"
+  },
+  {
+   "name" : "__netf2"
+  },
+  {
+   "name" : "__unordtf2"
   }
  ],
  "elf_objects" :
@@ -1706,6 +1733,32 @@
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
   },
   {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2EmP13native_handlemb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-270"
+    },
+    {
+     "referenced_type" : "type-17"
+    },
+    {
+     "referenced_type" : "type-36"
+    },
+    {
+     "referenced_type" : "type-17"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-88"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
    "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::operator=",
    "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEaSERKS7_",
    "parameters" :
@@ -1744,6 +1797,32 @@
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
   },
   {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2EmP13native_handlemb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-279"
+    },
+    {
+     "referenced_type" : "type-17"
+    },
+    {
+     "referenced_type" : "type-36"
+    },
+    {
+     "referenced_type" : "type-17"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-88"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
    "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::operator=",
    "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEaSERKS7_",
    "parameters" :
@@ -1794,26 +1873,6 @@
    "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::unmapGrantorDescr",
-   "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE17unmapGrantorDescrEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-446"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-16"
-    }
-   ],
-   "return_type" : "type-70",
-   "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
-  },
-  {
    "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::read",
    "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE4readEPS5_m",
    "parameters" :
@@ -1939,26 +1998,6 @@
    "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::unmapGrantorDescr",
-   "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE17unmapGrantorDescrEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-447"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-16"
-    }
-   ],
-   "return_type" : "type-70",
-   "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
-  },
-  {
    "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::read",
    "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE4readEPS5_m",
    "parameters" :
@@ -7078,8 +7117,8 @@
     }
    ],
    "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-13",
    "self_type" : "type-13",
@@ -7138,8 +7177,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-230",
    "self_type" : "type-230",
@@ -7180,8 +7219,8 @@
     }
    ],
    "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-225",
    "self_type" : "type-225",
@@ -7222,8 +7261,8 @@
     }
    ],
    "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-266",
    "self_type" : "type-266",
diff --git a/Q/64/x86_64/source-based/libui.so.lsdump b/Q/64/x86_64/source-based/libui.so.lsdump
index a815483..2c14427 100644
--- a/Q/64/x86_64/source-based/libui.so.lsdump
+++ b/Q/64/x86_64/source-based/libui.so.lsdump
@@ -24,7 +24,7 @@
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
    "referenced_type" : "type-218",
-   "self_type" : "type-2439",
+   "self_type" : "type-2429",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -1178,6 +1178,9 @@
    "name" : "_ZNK7android17Gralloc3Allocator8isLoadedEv"
   },
   {
+   "name" : "_ZNK7android22GraphicBufferAllocator12getTotalSizeEv"
+  },
+  {
    "name" : "_ZNK7android22GraphicBufferAllocator4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
   },
   {
@@ -2189,8 +2192,8 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "underlying_type" : "type-123",
@@ -4426,8 +4429,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2450",
-   "self_type" : "type-2450",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "underlying_type" : "type-123",
@@ -4460,8 +4463,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2451",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "underlying_type" : "type-123",
@@ -7930,7 +7933,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2459"
+     "referenced_type" : "type-2449"
     }
    ],
    "return_type" : "type-150",
@@ -8087,7 +8090,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     },
     {
      "referenced_type" : "type-10"
@@ -8106,7 +8109,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     },
     {
      "referenced_type" : "type-10"
@@ -8131,7 +8134,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     },
     {
      "referenced_type" : "type-123"
@@ -8153,7 +8156,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     }
    ],
    "return_type" : "type-150",
@@ -8192,10 +8195,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     },
     {
-     "referenced_type" : "type-2449"
+     "referenced_type" : "type-2439"
     }
    ],
    "return_type" : "type-150",
@@ -8208,7 +8211,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     },
     {
      "referenced_type" : "type-123"
@@ -8224,7 +8227,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     }
    ],
    "return_type" : "type-150",
@@ -8237,10 +8240,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     },
     {
-     "referenced_type" : "type-2449"
+     "referenced_type" : "type-2439"
     }
    ],
    "return_type" : "type-150",
@@ -8253,7 +8256,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     },
     {
      "referenced_type" : "type-123"
@@ -8269,7 +8272,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     }
    ],
    "return_type" : "type-150",
@@ -8282,7 +8285,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     }
    ],
    "return_type" : "type-150",
@@ -8295,7 +8298,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     }
    ],
    "return_type" : "type-150",
@@ -8308,13 +8311,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2447"
+     "referenced_type" : "type-2437"
     },
     {
-     "referenced_type" : "type-2449"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-2453",
+   "return_type" : "type-2443",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8557,13 +8560,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8573,13 +8576,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8589,10 +8592,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -8601,7 +8604,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8612,7 +8615,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
@@ -8621,7 +8624,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8632,10 +8635,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -8647,7 +8650,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8658,16 +8661,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8677,7 +8680,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -8686,7 +8689,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8696,10 +8699,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8709,7 +8712,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -8737,10 +8740,10 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
@@ -8759,10 +8762,10 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
@@ -8787,13 +8790,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
    "return_type" : "type-150",
@@ -8809,13 +8812,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -8833,10 +8836,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2398",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8846,7 +8849,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
@@ -8862,7 +8865,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -8881,7 +8884,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-123"
@@ -8900,7 +8903,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-150",
@@ -8913,13 +8916,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8929,13 +8932,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8945,10 +8948,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -8957,7 +8960,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8967,13 +8970,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8983,13 +8986,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8999,10 +9002,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -9011,7 +9014,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9021,13 +9024,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9037,13 +9040,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9053,10 +9056,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -9065,7 +9068,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9075,7 +9078,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-288"
@@ -9095,7 +9098,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-10"
@@ -9104,7 +9107,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9114,10 +9117,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -9136,7 +9139,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-103"
@@ -9155,7 +9158,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1120"
@@ -9174,7 +9177,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
@@ -9190,10 +9193,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
    "return_type" : "type-150",
@@ -9206,7 +9209,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-150",
@@ -9219,7 +9222,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
@@ -9235,10 +9238,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
    "return_type" : "type-150",
@@ -9251,7 +9254,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-150",
@@ -9264,7 +9267,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-150",
@@ -9277,7 +9280,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-150",
@@ -9290,13 +9293,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2405",
+   "return_type" : "type-2394",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10244,6 +10247,19 @@
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
+   "function_name" : "android::GraphicBufferAllocator::getTotalSize",
+   "linker_set_key" : "_ZNK7android22GraphicBufferAllocator12getTotalSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-721"
+    }
+   ],
+   "return_type" : "type-124",
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
+  },
+  {
    "function_name" : "android::GraphicBufferAllocator::dump",
    "linker_set_key" : "_ZNK7android22GraphicBufferAllocator4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE",
    "parameters" :
@@ -10266,7 +10282,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
      "referenced_type" : "type-103"
@@ -10285,7 +10301,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
    "return_type" : "type-6",
@@ -10298,7 +10314,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
    "return_type" : "type-123",
@@ -10311,7 +10327,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
    "return_type" : "type-10",
@@ -10324,7 +10340,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
    "return_type" : "type-10",
@@ -10337,7 +10353,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
    "return_type" : "type-10",
@@ -10350,7 +10366,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
    "return_type" : "type-10",
@@ -10363,7 +10379,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
      "referenced_type" : "type-288"
@@ -10379,10 +10395,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
-     "referenced_type" : "type-2454"
+     "referenced_type" : "type-2444"
     },
     {
      "referenced_type" : "type-288"
@@ -10399,7 +10415,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
    "return_type" : "type-123",
@@ -10412,7 +10428,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
    "return_type" : "type-123",
@@ -10425,10 +10441,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
-   "return_type" : "type-2445",
+   "return_type" : "type-2435",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10438,10 +10454,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     }
    ],
-   "return_type" : "type-2438",
+   "return_type" : "type-2428",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10451,7 +10467,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
      "referenced_type" : "type-1246"
@@ -10471,13 +10487,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2398",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10487,7 +10503,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
      "referenced_type" : "type-1051"
@@ -10503,7 +10519,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
      "referenced_type" : "type-1055"
@@ -10519,7 +10535,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
      "referenced_type" : "type-1279"
@@ -10535,7 +10551,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
      "referenced_type" : "type-103"
@@ -10554,7 +10570,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
      "referenced_type" : "type-124"
@@ -10570,13 +10586,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2452"
+     "referenced_type" : "type-2442"
     },
     {
-     "referenced_type" : "type-2449"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-2445",
+   "return_type" : "type-2435",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10768,13 +10784,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10784,13 +10800,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10800,10 +10816,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -10812,7 +10828,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10822,7 +10838,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     }
    ],
    "return_type" : "type-124",
@@ -10835,10 +10851,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
    "return_type" : "type-6",
@@ -10851,7 +10867,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     }
    ],
    "return_type" : "type-1297",
@@ -10864,7 +10880,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-288"
@@ -10884,10 +10900,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2408"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-288"
@@ -10907,7 +10923,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     }
    ],
    "return_type" : "type-1297",
@@ -10920,13 +10936,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10936,13 +10952,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10952,10 +10968,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -10964,7 +10980,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10974,7 +10990,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-217"
@@ -10993,7 +11009,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1283"
@@ -11009,7 +11025,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-103"
@@ -11028,10 +11044,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2407"
+     "referenced_type" : "type-2396"
     }
    ],
    "return_type" : "type-1297",
@@ -11044,13 +11060,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11060,13 +11076,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11076,10 +11092,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -11088,7 +11104,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11098,13 +11114,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11114,13 +11130,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11130,10 +11146,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -11142,7 +11158,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11153,7 +11169,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1246"
@@ -11162,7 +11178,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11173,10 +11189,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -11188,7 +11204,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11199,16 +11215,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11218,7 +11234,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-103"
@@ -11227,7 +11243,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2402",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11238,7 +11254,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2388"
     },
     {
      "referenced_type" : "type-217"
@@ -11258,7 +11274,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2388"
     },
     {
      "referenced_type" : "type-217"
@@ -11278,7 +11294,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2388"
     },
     {
      "referenced_type" : "type-217"
@@ -11301,7 +11317,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2388"
     },
     {
      "referenced_type" : "type-217"
@@ -11324,7 +11340,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2388"
     },
     {
      "referenced_type" : "type-217"
@@ -11347,7 +11363,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2388"
     },
     {
      "referenced_type" : "type-217"
@@ -11502,7 +11518,7 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2402",
+   "referenced_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11627,8 +11643,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2394",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11654,8 +11670,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2387",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11672,8 +11688,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2444",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2434",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11942,8 +11958,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2453",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2443",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -11980,8 +11996,8 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2410",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -12001,8 +12017,8 @@
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2425",
+   "self_type" : "type-2427",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12160,8 +12176,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2404",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2393",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12187,8 +12203,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2387",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2386",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12205,8 +12221,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2442",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2433",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12430,8 +12446,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2449",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2439",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12486,8 +12502,8 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2416",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -12609,8 +12625,8 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2483",
-   "self_type" : "type-2485",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2475",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12803,8 +12819,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2681",
+   "referenced_type" : "type-2663",
+   "self_type" : "type-2671",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12947,8 +12963,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2576",
-   "self_type" : "type-2575",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2565",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13118,8 +13134,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13145,8 +13161,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2397",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13154,8 +13170,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2455",
-   "self_type" : "type-2454",
+   "referenced_type" : "type-2445",
+   "self_type" : "type-2444",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13163,8 +13179,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2460",
-   "self_type" : "type-2459",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2449",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13274,8 +13290,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2641",
-   "self_type" : "type-2640",
+   "referenced_type" : "type-2631",
+   "self_type" : "type-2630",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13283,8 +13299,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-2654",
+   "self_type" : "type-2653",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13328,8 +13344,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2632",
-   "self_type" : "type-2631",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2621",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13337,8 +13353,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2690",
-   "self_type" : "type-2689",
+   "referenced_type" : "type-2680",
+   "self_type" : "type-2679",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13362,24 +13378,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::CallStack *",
-   "name" : "android::CallStack *",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2392",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::CallStack::StackDeleter *",
-   "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2396",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-980",
@@ -13832,8 +13830,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2468",
-   "self_type" : "type-2467",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2457",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13841,8 +13839,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2634",
-   "self_type" : "type-2633",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2623",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13850,8 +13848,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2660",
-   "self_type" : "type-2659",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2649",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13931,8 +13929,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2392",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13985,17 +13983,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2386",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2384",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14039,8 +14028,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2431",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14057,8 +14046,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2423",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14876,8 +14865,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2437",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14885,8 +14874,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2446",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2448",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14982,15 +14971,6 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::CallStack *",
-   "name" : "const android::CallStack *",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2394",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const android::ColorSpace *",
    "name" : "const android::ColorSpace *",
    "referenced_type" : "type-1040",
@@ -15173,8 +15153,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2395",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15209,17 +15189,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2387",
-   "self_type" : "type-2390",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::String8> *",
-   "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2388",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15731,8 +15702,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2448",
-   "self_type" : "type-2452",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2442",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15740,8 +15711,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2457",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2447",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16110,7 +16081,7 @@
    "linker_set_key" : "unsigned long *",
    "name" : "unsigned long *",
    "referenced_type" : "type-124",
-   "self_type" : "type-2407",
+   "self_type" : "type-2396",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16365,8 +16336,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2467",
-   "self_type" : "type-2466",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2456",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16375,8 +16346,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2633",
-   "self_type" : "type-2635",
+   "referenced_type" : "type-2623",
+   "self_type" : "type-2625",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16385,8 +16356,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2661",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2651",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16488,8 +16459,8 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2418",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -16538,8 +16509,8 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2425",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -16561,16 +16532,6 @@
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::CallStack",
-   "name" : "const android::CallStack",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2393",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
    "alignment" : 16,
    "is_const" : true,
    "linker_set_key" : "const android::ColorSpace",
@@ -16875,8 +16836,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2402",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2389",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16915,18 +16876,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2387",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::String8>",
-   "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2385",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16975,8 +16926,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2432",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -17765,8 +17716,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2438",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17775,8 +17726,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2446",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2446",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17858,8 +17809,8 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2425",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2414",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -18008,8 +17959,8 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2484",
-   "self_type" : "type-2483",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18255,8 +18206,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-2522",
-   "self_type" : "type-2521",
+   "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"
   },
@@ -18445,8 +18396,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-2528",
-   "self_type" : "type-2527",
+   "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"
   },
@@ -18625,8 +18576,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-2530",
-   "self_type" : "type-2529",
+   "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"
   },
@@ -18805,8 +18756,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-2526",
-   "self_type" : "type-2525",
+   "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"
   },
@@ -18985,8 +18936,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-2532",
-   "self_type" : "type-2531",
+   "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"
   },
@@ -19155,8 +19106,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-2520",
-   "self_type" : "type-2519",
+   "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"
   },
@@ -19335,8 +19286,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-2524",
-   "self_type" : "type-2523",
+   "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"
   },
@@ -19525,8 +19476,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-2540",
-   "self_type" : "type-2539",
+   "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"
   },
@@ -19705,8 +19656,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-2544",
-   "self_type" : "type-2543",
+   "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"
   },
@@ -19885,8 +19836,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-2542",
-   "self_type" : "type-2541",
+   "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"
   },
@@ -20065,8 +20016,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-2538",
-   "self_type" : "type-2537",
+   "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"
   },
@@ -20245,8 +20196,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-2546",
-   "self_type" : "type-2545",
+   "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"
   },
@@ -20395,8 +20346,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-2558",
-   "self_type" : "type-2557",
+   "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"
   },
@@ -20525,8 +20476,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-2556",
-   "self_type" : "type-2555",
+   "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"
   },
@@ -20655,8 +20606,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-2554",
-   "self_type" : "type-2553",
+   "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"
   },
@@ -20785,8 +20736,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-2552",
-   "self_type" : "type-2551",
+   "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"
   },
@@ -20915,8 +20866,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-2560",
-   "self_type" : "type-2559",
+   "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"
   },
@@ -21125,8 +21076,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2404",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21165,8 +21116,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21235,8 +21186,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2674",
-   "self_type" : "type-2673",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2663",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21395,8 +21346,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2577",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2566",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21850,35 +21801,6 @@
    ]
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFrameLines",
-     "referenced_type" : "type-2381"
-    }
-   ],
-   "linker_set_key" : "android::CallStack",
-   "name" : "android::CallStack",
-   "record_kind" : "class",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2391",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStackE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CallStack::StackDeleter",
-   "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2395",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
-  },
-  {
    "alignment" : 16,
    "fields" :
    [
@@ -22817,11 +22739,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2391",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2398" ],
+   "template_args" : [ "type-2390" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -23198,7 +23120,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2397"
+     "referenced_type" : "type-2391"
     }
    ],
    "fields" :
@@ -23206,14 +23128,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2385"
+     "referenced_type" : "type-2383"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2390",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -23644,8 +23566,8 @@
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2383",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -23806,61 +23728,6 @@
      "referenced_type" : "type-236"
     }
    ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2381",
-   "size" : 40,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-287" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvm"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvm"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-236"
-    }
-   ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
@@ -24225,28 +24092,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2422"
+     "referenced_type" : "type-2412"
     },
     {
-     "referenced_type" : "type-2423"
+     "referenced_type" : "type-2413"
+    },
+    {
+     "referenced_type" : "type-2411"
+    },
+    {
+     "referenced_type" : "type-2419"
+    },
+    {
+     "referenced_type" : "type-2420"
+    },
+    {
+     "referenced_type" : "type-2422"
     },
     {
      "referenced_type" : "type-2421"
     },
     {
-     "referenced_type" : "type-2429"
-    },
-    {
-     "referenced_type" : "type-2430"
-    },
-    {
-     "referenced_type" : "type-2432"
-    },
-    {
-     "referenced_type" : "type-2431"
-    },
-    {
-     "referenced_type" : "type-2434"
+     "referenced_type" : "type-2424"
     }
    ],
    "fields" :
@@ -24254,14 +24121,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2429"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2428",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -24284,8 +24151,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-2434",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24308,8 +24175,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-2431",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24332,8 +24199,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-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24356,8 +24223,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-2430",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24380,8 +24247,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-2432",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25766,8 +25633,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-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25898,8 +25765,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-2423",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26282,8 +26149,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-2422",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -29116,8 +28983,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30029,8 +29896,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30098,7 +29965,7 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
      "access" : "private",
@@ -30110,8 +29977,8 @@
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2445",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -30128,8 +29995,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2446",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -30139,13 +30006,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2413"
+     "referenced_type" : "type-2382"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2381",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
diff --git a/Q/64/x86_x86_64/source-based/libstagefright_bufferpool@2.0.so.lsdump b/Q/64/x86_x86_64/source-based/libstagefright_bufferpool@2.0.so.lsdump
index b23246a..a7d8cc3 100644
--- a/Q/64/x86_x86_64/source-based/libstagefright_bufferpool@2.0.so.lsdump
+++ b/Q/64/x86_x86_64/source-based/libstagefright_bufferpool@2.0.so.lsdump
@@ -188,10 +188,26 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2EjP13native_handlejb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEaSERKS7_"
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2EjP13native_handlejb"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEaSERKS7_"
   },
   {
@@ -204,10 +220,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE17unmapGrantorDescrEPvj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE4readEPS5_j"
   },
   {
@@ -236,10 +248,6 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE17unmapGrantorDescrEPvj"
-  },
-  {
-   "binding" : "weak",
    "name" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE4readEPS5_j"
   },
   {
@@ -1676,6 +1684,54 @@
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-268"
+    },
+    {
+     "referenced_type" : "type-272"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEC2EjP13native_handlejb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-268"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-87"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
    "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::operator=",
    "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EEaSERKS7_",
    "parameters" :
@@ -1692,6 +1748,54 @@
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
   },
   {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2ERKNSt3__16vectorINS0_17GrantorDescriptorENS8_9allocatorISA_EEEEP13native_handlej",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-277"
+    },
+    {
+     "referenced_type" : "type-272"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
+   "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::MQDescriptor",
+   "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEC2EjP13native_handlejb",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-277"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "referenced_type" : "type-35"
+    },
+    {
+     "referenced_type" : "type-13"
+    },
+    {
+     "default_arg" : true,
+     "referenced_type" : "type-87"
+    }
+   ],
+   "return_type" : "type-70",
+   "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h"
+  },
+  {
    "function_name" : "android::hardware::MQDescriptor<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::operator=",
    "linker_set_key" : "_ZN7android8hardware12MQDescriptorINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EEaSERKS7_",
    "parameters" :
@@ -1742,26 +1846,6 @@
    "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::unmapGrantorDescr",
-   "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE17unmapGrantorDescrEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-444"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-13"
-    }
-   ],
-   "return_type" : "type-70",
-   "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
-  },
-  {
    "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferStatusMessage, android::hardware::kSynchronizedReadWrite>::read",
    "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_019BufferStatusMessageELNS0_8MQFlavorE1EE4readEPS5_j",
    "parameters" :
@@ -1887,26 +1971,6 @@
    "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
   },
   {
-   "access" : "private",
-   "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::unmapGrantorDescr",
-   "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE17unmapGrantorDescrEPvj",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-445"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-13"
-    }
-   ],
-   "return_type" : "type-70",
-   "source_file" : "/system/libfmq/include/fmq/MessageQueue.h"
-  },
-  {
    "function_name" : "android::hardware::MessageQueue<android::hardware::media::bufferpool::V2_0::BufferInvalidationMessage, android::hardware::kUnsynchronizedWrite>::read",
    "linker_set_key" : "_ZN7android8hardware12MessageQueueINS0_5media10bufferpool4V2_025BufferInvalidationMessageELNS0_8MQFlavorE2EE4readEPS5_j",
    "parameters" :
@@ -7026,8 +7090,8 @@
     }
    ],
    "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-10",
    "self_type" : "type-10",
@@ -7086,8 +7150,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<const char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-228",
    "self_type" : "type-228",
@@ -7128,8 +7192,8 @@
     }
    ],
    "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-223",
    "self_type" : "type-223",
@@ -7170,8 +7234,8 @@
     }
    ],
    "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-264",
    "self_type" : "type-264",
diff --git a/Q/64/x86_x86_64/source-based/libui.so.lsdump b/Q/64/x86_x86_64/source-based/libui.so.lsdump
index 17ccc10..ba6360c 100644
--- a/Q/64/x86_x86_64/source-based/libui.so.lsdump
+++ b/Q/64/x86_x86_64/source-based/libui.so.lsdump
@@ -24,7 +24,7 @@
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
    "referenced_type" : "type-200",
-   "self_type" : "type-2438",
+   "self_type" : "type-2428",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -1178,6 +1178,9 @@
    "name" : "_ZNK7android17Gralloc3Allocator8isLoadedEv"
   },
   {
+   "name" : "_ZNK7android22GraphicBufferAllocator12getTotalSizeEv"
+  },
+  {
    "name" : "_ZNK7android22GraphicBufferAllocator4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
   },
   {
@@ -2193,8 +2196,8 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "underlying_type" : "type-123",
@@ -4430,8 +4433,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2449",
-   "self_type" : "type-2449",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "underlying_type" : "type-123",
@@ -4464,8 +4467,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2450",
-   "self_type" : "type-2450",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "underlying_type" : "type-123",
@@ -7934,7 +7937,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2458"
+     "referenced_type" : "type-2448"
     }
    ],
    "return_type" : "type-151",
@@ -8091,7 +8094,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
      "referenced_type" : "type-10"
@@ -8110,7 +8113,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
      "referenced_type" : "type-10"
@@ -8135,7 +8138,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
      "referenced_type" : "type-123"
@@ -8157,7 +8160,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     }
    ],
    "return_type" : "type-151",
@@ -8196,10 +8199,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2438"
     }
    ],
    "return_type" : "type-151",
@@ -8212,7 +8215,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
      "referenced_type" : "type-123"
@@ -8228,7 +8231,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     }
    ],
    "return_type" : "type-151",
@@ -8241,10 +8244,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2438"
     }
    ],
    "return_type" : "type-151",
@@ -8257,7 +8260,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
      "referenced_type" : "type-123"
@@ -8273,7 +8276,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     }
    ],
    "return_type" : "type-151",
@@ -8286,7 +8289,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     }
    ],
    "return_type" : "type-151",
@@ -8299,7 +8302,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     }
    ],
    "return_type" : "type-151",
@@ -8312,13 +8315,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2446"
+     "referenced_type" : "type-2436"
     },
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-2452",
+   "return_type" : "type-2442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8561,13 +8564,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8577,13 +8580,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8593,10 +8596,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -8605,7 +8608,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8616,7 +8619,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
@@ -8625,7 +8628,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8636,10 +8639,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -8651,7 +8654,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8662,16 +8665,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8681,7 +8684,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-103"
@@ -8690,7 +8693,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8700,10 +8703,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8713,7 +8716,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-103"
@@ -8741,10 +8744,10 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
@@ -8763,10 +8766,10 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-1246"
@@ -8791,13 +8794,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-151",
@@ -8813,13 +8816,13 @@
      "referenced_type" : "type-123"
     },
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -8837,10 +8840,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2397",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8850,7 +8853,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
@@ -8866,7 +8869,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-103"
@@ -8885,7 +8888,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-123"
@@ -8904,7 +8907,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     }
    ],
    "return_type" : "type-151",
@@ -8917,13 +8920,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8933,13 +8936,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8949,10 +8952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -8961,7 +8964,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8971,13 +8974,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8987,13 +8990,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9003,10 +9006,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -9015,7 +9018,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9025,13 +9028,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9041,13 +9044,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9057,10 +9060,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -9069,7 +9072,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9079,7 +9082,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-286"
@@ -9099,7 +9102,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-10"
@@ -9108,7 +9111,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9118,10 +9121,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -9140,7 +9143,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2404"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-103"
@@ -9159,7 +9162,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1119"
@@ -9178,7 +9181,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
@@ -9194,10 +9197,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-151",
@@ -9210,7 +9213,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     }
    ],
    "return_type" : "type-151",
@@ -9223,7 +9226,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
      "referenced_type" : "type-1246"
@@ -9239,10 +9242,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-151",
@@ -9255,7 +9258,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     }
    ],
    "return_type" : "type-151",
@@ -9268,7 +9271,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     }
    ],
    "return_type" : "type-151",
@@ -9281,7 +9284,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     }
    ],
    "return_type" : "type-151",
@@ -9294,13 +9297,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2402"
+     "referenced_type" : "type-2391"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2404",
+   "return_type" : "type-2393",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10248,6 +10251,19 @@
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
+   "function_name" : "android::GraphicBufferAllocator::getTotalSize",
+   "linker_set_key" : "_ZNK7android22GraphicBufferAllocator12getTotalSizeEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-721"
+    }
+   ],
+   "return_type" : "type-123",
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
+  },
+  {
    "function_name" : "android::GraphicBufferAllocator::dump",
    "linker_set_key" : "_ZNK7android22GraphicBufferAllocator4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE",
    "parameters" :
@@ -10270,7 +10286,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-103"
@@ -10289,7 +10305,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-6",
@@ -10302,7 +10318,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-123",
@@ -10315,7 +10331,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-10",
@@ -10328,7 +10344,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-10",
@@ -10341,7 +10357,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-10",
@@ -10354,7 +10370,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-10",
@@ -10367,7 +10383,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-286"
@@ -10383,10 +10399,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
-     "referenced_type" : "type-2453"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-286"
@@ -10403,7 +10419,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-123",
@@ -10416,7 +10432,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
    "return_type" : "type-123",
@@ -10429,10 +10445,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-2444",
+   "return_type" : "type-2434",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10442,10 +10458,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-2437",
+   "return_type" : "type-2427",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10455,7 +10471,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-1246"
@@ -10475,13 +10491,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2397",
+   "return_type" : "type-2389",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10491,7 +10507,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-1050"
@@ -10507,7 +10523,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-1054"
@@ -10523,7 +10539,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-1280"
@@ -10539,7 +10555,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-103"
@@ -10558,7 +10574,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
      "referenced_type" : "type-123"
@@ -10574,13 +10590,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2451"
+     "referenced_type" : "type-2441"
     },
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-2444",
+   "return_type" : "type-2434",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10772,13 +10788,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10788,13 +10804,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10804,10 +10820,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -10816,7 +10832,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10826,7 +10842,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     }
    ],
    "return_type" : "type-123",
@@ -10839,10 +10855,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
    "return_type" : "type-6",
@@ -10855,7 +10871,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     }
    ],
    "return_type" : "type-1299",
@@ -10868,7 +10884,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-286"
@@ -10888,10 +10904,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2406"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-286"
@@ -10911,7 +10927,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     }
    ],
    "return_type" : "type-1299",
@@ -10924,13 +10940,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10940,13 +10956,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10956,10 +10972,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -10968,7 +10984,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10978,7 +10994,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-227"
@@ -10997,7 +11013,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1284"
@@ -11013,7 +11029,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-103"
@@ -11032,7 +11048,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-122"
@@ -11048,13 +11064,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11064,13 +11080,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11080,10 +11096,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -11092,7 +11108,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11102,13 +11118,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11118,13 +11134,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11134,10 +11150,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -11146,7 +11162,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11157,7 +11173,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
@@ -11166,7 +11182,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11177,10 +11193,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-103"
@@ -11192,7 +11208,7 @@
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11203,16 +11219,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2403"
+     "referenced_type" : "type-2392"
     },
     {
      "referenced_type" : "type-123"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11222,7 +11238,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2405"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-103"
@@ -11231,7 +11247,7 @@
      "referenced_type" : "type-103"
     }
    ],
-   "return_type" : "type-2401",
+   "return_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11242,7 +11258,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-227"
@@ -11262,7 +11278,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-227"
@@ -11282,7 +11298,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-227"
@@ -11305,7 +11321,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-227"
@@ -11328,7 +11344,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-227"
@@ -11351,7 +11367,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2389"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-227"
@@ -11506,7 +11522,7 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2401",
+   "referenced_type" : "type-2388",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11631,8 +11647,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2404",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11658,8 +11674,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2386",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11676,8 +11692,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2433",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11946,8 +11962,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2452",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -11984,8 +12000,8 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2418",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2408",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -12005,8 +12021,8 @@
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2426",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12164,8 +12180,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2401",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2388",
+   "self_type" : "type-2392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12191,8 +12207,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2386",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12209,8 +12225,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12434,8 +12450,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2447",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2438",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12490,8 +12506,8 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2414",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -12606,8 +12622,8 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2481",
-   "self_type" : "type-2483",
+   "referenced_type" : "type-2471",
+   "self_type" : "type-2473",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12807,8 +12823,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2672",
-   "self_type" : "type-2679",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2669",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12951,8 +12967,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2575",
-   "self_type" : "type-2574",
+   "referenced_type" : "type-2565",
+   "self_type" : "type-2564",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13122,8 +13138,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-2426",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2415",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13149,8 +13165,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-2407",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2395",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13158,8 +13174,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-2454",
-   "self_type" : "type-2453",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2443",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13167,8 +13183,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-2459",
-   "self_type" : "type-2458",
+   "referenced_type" : "type-2449",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13278,8 +13294,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2641",
-   "self_type" : "type-2640",
+   "referenced_type" : "type-2631",
+   "self_type" : "type-2630",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13287,8 +13303,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-2653",
+   "self_type" : "type-2652",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13332,8 +13348,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2631",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2621",
+   "self_type" : "type-2620",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13341,8 +13357,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2687",
+   "referenced_type" : "type-2678",
+   "self_type" : "type-2677",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13366,24 +13382,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::CallStack *",
-   "name" : "android::CallStack *",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2391",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::CallStack::StackDeleter *",
-   "name" : "android::CallStack::StackDeleter *",
-   "referenced_type" : "type-2394",
-   "self_type" : "type-2395",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-979",
@@ -13585,7 +13583,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2400",
+   "self_type" : "type-2399",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13836,8 +13834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2467",
-   "self_type" : "type-2466",
+   "referenced_type" : "type-2457",
+   "self_type" : "type-2456",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13845,8 +13843,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2633",
-   "self_type" : "type-2632",
+   "referenced_type" : "type-2623",
+   "self_type" : "type-2622",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13854,8 +13852,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2658",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2648",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13935,8 +13933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2402",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13989,17 +13987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2385",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<android::String8> *",
-   "name" : "android::Vector<android::String8> *",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14043,8 +14032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2430",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14061,8 +14050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2422",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14880,8 +14869,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2436",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14889,8 +14878,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2457",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2447",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14986,15 +14975,6 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::CallStack *",
-   "name" : "const android::CallStack *",
-   "referenced_type" : "type-2392",
-   "self_type" : "type-2393",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace *",
    "name" : "const android::ColorSpace *",
    "referenced_type" : "type-1039",
@@ -15123,8 +15103,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2398",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2398",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15177,8 +15157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2401",
-   "self_type" : "type-2405",
+   "referenced_type" : "type-2388",
+   "self_type" : "type-2394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15213,17 +15193,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2386",
-   "self_type" : "type-2389",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Vector<android::String8> *",
-   "name" : "const android::Vector<android::String8> *",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15735,8 +15706,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2447",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2441",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15744,8 +15715,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2455",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2445",
+   "self_type" : "type-2446",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16360,8 +16331,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2466",
-   "self_type" : "type-2465",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2455",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16370,8 +16341,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2632",
-   "self_type" : "type-2634",
+   "referenced_type" : "type-2622",
+   "self_type" : "type-2624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16380,8 +16351,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2658",
-   "self_type" : "type-2660",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2650",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16483,8 +16454,8 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -16533,8 +16504,8 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2425",
+   "self_type" : "type-2424",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -16556,16 +16527,6 @@
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::CallStack",
-   "name" : "const android::CallStack",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2392",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h"
-  },
-  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::ColorSpace",
@@ -16811,7 +16772,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2398",
+   "self_type" : "type-2397",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16870,8 +16831,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2388",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16910,18 +16871,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2386",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Vector<android::String8>",
-   "name" : "const android::Vector<android::String8>",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2384",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16970,8 +16921,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2431",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -17760,8 +17711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2437",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17770,8 +17721,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2455",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2445",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17853,8 +17804,8 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2412",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17995,8 +17946,8 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2482",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2471",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18250,8 +18201,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-2520",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2510",
+   "self_type" : "type-2509",
    "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"
   },
@@ -18440,8 +18391,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-2526",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2515",
    "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"
   },
@@ -18620,8 +18571,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-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
    "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"
   },
@@ -18790,8 +18741,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-2524",
-   "self_type" : "type-2523",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
    "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"
   },
@@ -18980,8 +18931,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-2530",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "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"
   },
@@ -19150,8 +19101,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-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2508",
+   "self_type" : "type-2507",
    "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"
   },
@@ -19330,8 +19281,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-2522",
-   "self_type" : "type-2521",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2511",
    "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"
   },
@@ -19520,8 +19471,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-2538",
-   "self_type" : "type-2537",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2527",
    "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"
   },
@@ -19700,8 +19651,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-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "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"
   },
@@ -19880,8 +19831,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-2540",
-   "self_type" : "type-2539",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "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"
   },
@@ -20060,8 +20011,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-2536",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2525",
    "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"
   },
@@ -20240,8 +20191,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-2544",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "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"
   },
@@ -20390,8 +20341,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-2556",
-   "self_type" : "type-2555",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2545",
    "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"
   },
@@ -20520,8 +20471,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-2554",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
    "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"
   },
@@ -20650,8 +20601,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-2552",
-   "self_type" : "type-2551",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
    "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"
   },
@@ -20780,8 +20731,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-2550",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2540",
+   "self_type" : "type-2539",
    "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"
   },
@@ -20910,8 +20861,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-2558",
-   "self_type" : "type-2557",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2547",
    "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"
   },
@@ -21120,8 +21071,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2402",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21160,8 +21111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2404",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21230,8 +21181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2663",
+   "self_type" : "type-2662",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21390,8 +21341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2576",
-   "self_type" : "type-2575",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2565",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21835,35 +21786,6 @@
    ]
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFrameLines",
-     "referenced_type" : "type-2380"
-    }
-   ],
-   "linker_set_key" : "android::CallStack",
-   "name" : "android::CallStack",
-   "record_kind" : "class",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStackE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::CallStack::StackDeleter",
-   "name" : "android::CallStack::StackDeleter",
-   "referenced_type" : "type-2394",
-   "self_type" : "type-2394",
-   "size" : 1,
-   "source_file" : "/system/core/libutils/include/utils/CallStack.h",
-   "unique_id" : "_ZTSN7android9CallStack12StackDeleterE"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
@@ -22802,11 +22724,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2396",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2390",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2397" ],
+   "template_args" : [ "type-2389" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -23183,7 +23105,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2396"
+     "referenced_type" : "type-2390"
     }
    ],
    "fields" :
@@ -23191,14 +23113,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2384"
+     "referenced_type" : "type-2382"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2389",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -23629,8 +23551,8 @@
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2382",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -23791,61 +23713,6 @@
      "referenced_type" : "type-235"
     }
    ],
-   "linker_set_key" : "android::Vector<android::String8>",
-   "name" : "android::Vector<android::String8>",
-   "record_kind" : "class",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2380",
-   "size" : 20,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-285" ],
-   "unique_id" : "_ZTSN7android6VectorINS_7String8EEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android6VectorINS_7String8EEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android6VectorINS_7String8EED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE12do_constructEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE10do_destroyEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE7do_copyEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE8do_splatEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE15do_move_forwardEPvPKvj"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android6VectorINS_7String8EE16do_move_backwardEPvPKvj"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "access" : "private",
-     "referenced_type" : "type-235"
-    }
-   ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
@@ -24210,28 +24077,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2410"
     },
     {
-     "referenced_type" : "type-2421"
+     "referenced_type" : "type-2411"
+    },
+    {
+     "referenced_type" : "type-2409"
+    },
+    {
+     "referenced_type" : "type-2417"
     },
     {
      "referenced_type" : "type-2419"
     },
     {
-     "referenced_type" : "type-2428"
+     "referenced_type" : "type-2421"
     },
     {
-     "referenced_type" : "type-2429"
+     "referenced_type" : "type-2420"
     },
     {
-     "referenced_type" : "type-2431"
-    },
-    {
-     "referenced_type" : "type-2430"
-    },
-    {
-     "referenced_type" : "type-2433"
+     "referenced_type" : "type-2423"
     }
    ],
    "fields" :
@@ -24239,14 +24106,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2428"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2427",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -24269,8 +24136,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-2433",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24293,8 +24160,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-2430",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24317,8 +24184,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-2428",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2417",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24341,8 +24208,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-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24365,8 +24232,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-2431",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25751,8 +25618,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-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2409",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25883,8 +25750,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-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26267,8 +26134,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-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2410",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -29101,8 +28968,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2408",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30014,8 +29881,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2401",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30083,7 +29950,7 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2445"
+     "referenced_type" : "type-2435"
     },
     {
      "access" : "private",
@@ -30095,8 +29962,8 @@
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2444",
-   "self_type" : "type-2444",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -30113,8 +29980,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2445",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -30124,13 +29991,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2411"
+     "referenced_type" : "type-2381"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2380",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],