diff --git a/Q/32/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump b/Q/32/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 2473668..f78a8c9 100644
--- a/Q/32/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/Q/32/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -524,9 +524,6 @@
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
   },
   {
-   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-  },
-  {
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
   },
   {
@@ -54463,9 +54460,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -55861,9 +55855,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -62026,9 +62017,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -63318,9 +63306,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -67608,8 +67593,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(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<FrameEventsDelta>::(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<FrameEventsDelta>::(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-357",
    "self_type" : "type-357",
@@ -67632,8 +67617,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-350",
    "self_type" : "type-350",
@@ -67656,8 +67641,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(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<Rect>::(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<Rect>::(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-373",
    "self_type" : "type-373",
@@ -67770,8 +67755,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-346",
    "self_type" : "type-346",
@@ -67812,8 +67797,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-340",
    "self_type" : "type-340",
@@ -67836,8 +67821,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(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-382",
    "self_type" : "type-382",
@@ -67878,8 +67863,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-354",
    "self_type" : "type-354",
@@ -67920,8 +67905,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-391",
    "self_type" : "type-391",
diff --git a/Q/32/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump b/Q/32/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
index cd5fb32..01acb53 100644
--- a/Q/32/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/Q/32/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -523,9 +523,6 @@
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
   },
   {
-   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-  },
-  {
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
   },
   {
@@ -47431,9 +47428,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -48829,9 +48823,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -54994,9 +54985,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -56286,9 +56274,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -60576,8 +60561,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(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<FrameEventsDelta>::(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<FrameEventsDelta>::(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-357",
    "self_type" : "type-357",
@@ -60600,8 +60585,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-350",
    "self_type" : "type-350",
@@ -60624,8 +60609,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(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<Rect>::(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<Rect>::(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-373",
    "self_type" : "type-373",
@@ -60738,8 +60723,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-346",
    "self_type" : "type-346",
@@ -60780,8 +60765,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-340",
    "self_type" : "type-340",
@@ -60804,8 +60789,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(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-382",
    "self_type" : "type-382",
@@ -60846,8 +60831,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-354",
    "self_type" : "type-354",
@@ -60888,8 +60873,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-391",
    "self_type" : "type-391",
diff --git a/Q/64/arm64_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump b/Q/64/arm64_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
index f8e5bdf..3806daf 100644
--- a/Q/64/arm64_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/Q/64/arm64_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -5,16 +5,16 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-1393",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1643",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h"
   },
   {
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE []",
    "name" : "OMX_COMPONENTREGISTERTYPE []",
-   "referenced_type" : "type-1366",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1504",
+   "self_type" : "type-1516",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -30,8 +30,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1697",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2425",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -39,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-1692",
-   "self_type" : "type-1691",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2419",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -81,7 +81,7 @@
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
    "referenced_type" : "type-4",
-   "self_type" : "type-1475",
+   "self_type" : "type-2204",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -89,8 +89,8 @@
    "alignment" : 4,
    "linker_set_key" : "int [3][3]",
    "name" : "int [3][3]",
-   "referenced_type" : "type-1475",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2203",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -108,7 +108,7 @@
    "linker_set_key" : "unsigned char [128]",
    "name" : "unsigned char [128]",
    "referenced_type" : "type-92",
-   "self_type" : "type-1372",
+   "self_type" : "type-1528",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -117,7 +117,7 @@
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
    "referenced_type" : "type-92",
-   "self_type" : "type-1584",
+   "self_type" : "type-2313",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -126,7 +126,7 @@
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
    "referenced_type" : "type-92",
-   "self_type" : "type-1376",
+   "self_type" : "type-1577",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -135,7 +135,7 @@
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
    "referenced_type" : "type-92",
-   "self_type" : "type-1585",
+   "self_type" : "type-2314",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -144,7 +144,7 @@
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
    "referenced_type" : "type-92",
-   "self_type" : "type-1451",
+   "self_type" : "type-2180",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -153,7 +153,7 @@
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
    "referenced_type" : "type-92",
-   "self_type" : "type-1581",
+   "self_type" : "type-2310",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -246,8 +246,8 @@
    "alignment" : 16,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-2918",
-   "self_type" : "type-2918",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1453",
    "size" : 16
   },
   {
@@ -524,9 +524,6 @@
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
   },
   {
-   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-  },
-  {
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
   },
   {
@@ -3155,8 +3152,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1678",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3209,8 +3206,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-1399",
-   "self_type" : "type-1399",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1671",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3307,8 +3304,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1892",
+   "self_type" : "type-1892",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3353,8 +3350,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1903",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3403,8 +3400,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1418",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1882",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3453,8 +3450,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2024",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3495,8 +3492,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1653",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3561,8 +3558,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-1393",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1638",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3703,8 +3700,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-1389",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1619",
+   "self_type" : "type-1619",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3745,8 +3742,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3783,8 +3780,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1810",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3829,8 +3826,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1414",
+   "referenced_type" : "type-1833",
+   "self_type" : "type-1833",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3871,8 +3868,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1855",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3929,8 +3926,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1437",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2090",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -3983,8 +3980,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1446",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2171",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4025,8 +4022,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1441",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2124",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4071,8 +4068,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-1440",
-   "self_type" : "type-1440",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2113",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4109,8 +4106,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1663",
+   "self_type" : "type-1663",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4147,8 +4144,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1634",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4205,8 +4202,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1757",
+   "self_type" : "type-1757",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4239,8 +4236,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-1409",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1777",
+   "self_type" : "type-1777",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4273,8 +4270,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-1465",
-   "self_type" : "type-1465",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4315,8 +4312,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-1404",
-   "self_type" : "type-1404",
+   "referenced_type" : "type-1724",
+   "self_type" : "type-1724",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4357,8 +4354,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-1405",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1734",
+   "self_type" : "type-1734",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "underlying_type" : "type-2",
@@ -4421,8 +4418,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1604",
+   "self_type" : "type-1604",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4475,8 +4472,8 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-1482",
-   "self_type" : "type-1482",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4717,8 +4714,8 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-2201",
+   "self_type" : "type-2201",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4763,8 +4760,8 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-1362",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1486",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -4801,8 +4798,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
    "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1509",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2238",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4843,8 +4840,8 @@
    ],
    "linker_set_key" : "OMX_DATAUNITTYPE",
    "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-1508",
-   "self_type" : "type-1508",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4869,8 +4866,8 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-1458",
+   "self_type" : "type-1458",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -4911,8 +4908,8 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-1511",
-   "self_type" : "type-1511",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2240",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -4937,8 +4934,8 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1463",
+   "self_type" : "type-1463",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -5115,8 +5112,8 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-1365",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1498",
+   "self_type" : "type-1498",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-4",
@@ -5189,8 +5186,8 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5255,8 +5252,8 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5289,8 +5286,8 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-1374",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-1564",
+   "self_type" : "type-1564",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -5335,8 +5332,8 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1519",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5405,8 +5402,8 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1478",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2207",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -5471,8 +5468,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-1570",
-   "self_type" : "type-1570",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5521,8 +5518,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1573",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5563,8 +5560,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2305",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5613,8 +5610,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1582",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2311",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -5655,8 +5652,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-1579",
-   "self_type" : "type-1579",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2308",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "underlying_type" : "type-2",
@@ -6353,8 +6350,8 @@
    ],
    "linker_set_key" : "OMX_INDEXTYPE",
    "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-1361",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
    "underlying_type" : "type-2",
@@ -6515,8 +6512,8 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2347",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6557,8 +6554,8 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-1619",
-   "self_type" : "type-1619",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6595,8 +6592,8 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-1620",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2349",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6633,8 +6630,8 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-1515",
-   "self_type" : "type-1515",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2244",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6675,8 +6672,8 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1486",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2215",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -6705,8 +6702,8 @@
    ],
    "linker_set_key" : "OMX_NUMERICALDATATYPE",
    "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1467",
+   "self_type" : "type-1467",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "underlying_type" : "type-2",
@@ -6751,8 +6748,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1587",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2316",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6793,8 +6790,8 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2334",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6843,8 +6840,8 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-1364",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1493",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "underlying_type" : "type-2",
@@ -6877,8 +6874,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-2338",
+   "self_type" : "type-2338",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6911,8 +6908,8 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "underlying_type" : "type-2",
@@ -6949,8 +6946,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2323",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -6987,8 +6984,8 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-1593",
-   "self_type" : "type-1593",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -7021,8 +7018,8 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2317",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -7059,8 +7056,8 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-1591",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2320",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "underlying_type" : "type-2",
@@ -7113,8 +7110,8 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1506",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2235",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -7219,8 +7216,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1554",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7257,8 +7254,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1555",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7311,8 +7308,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-1552",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7349,8 +7346,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-1566",
-   "self_type" : "type-1566",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7431,8 +7428,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-1521",
-   "self_type" : "type-1521",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7481,8 +7478,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-1526",
-   "self_type" : "type-1526",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7539,8 +7536,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2266",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7601,8 +7598,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-1536",
-   "self_type" : "type-1536",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2265",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7639,8 +7636,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1532",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2261",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7681,8 +7678,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1530",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2259",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7727,8 +7724,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-1542",
-   "self_type" : "type-1542",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7777,8 +7774,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-1541",
-   "self_type" : "type-1541",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7843,8 +7840,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1545",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7933,8 +7930,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -7991,8 +7988,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-1538",
-   "self_type" : "type-1538",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8033,8 +8030,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-1549",
-   "self_type" : "type-1549",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8075,8 +8072,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1547",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2276",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "underlying_type" : "type-2",
@@ -8141,8 +8138,8 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-1492",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2221",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "underlying_type" : "type-2",
@@ -8183,8 +8180,8 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-1564",
-   "self_type" : "type-1564",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "underlying_type" : "type-2",
@@ -8287,8 +8284,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1706",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8333,8 +8330,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1704",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8363,8 +8360,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-1703",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8487,8 +8484,8 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-1705",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8711,8 +8708,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-1710",
-   "self_type" : "type-1710",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-92",
@@ -8795,8 +8792,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8847,8 +8844,8 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-1690",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "underlying_type" : "type-2",
@@ -8925,8 +8922,8 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-1942",
-   "self_type" : "type-1942",
+   "referenced_type" : "type-2659",
+   "self_type" : "type-2659",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "underlying_type" : "type-2",
@@ -8943,8 +8940,8 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1934",
+   "referenced_type" : "type-2654",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "underlying_type" : "type-2",
@@ -8969,8 +8966,8 @@
    ],
    "linker_set_key" : "android::base::LogId",
    "name" : "android::base::LogId",
-   "referenced_type" : "type-4047",
-   "self_type" : "type-4047",
+   "referenced_type" : "type-4707",
+   "self_type" : "type-4707",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -9011,8 +9008,8 @@
    ],
    "linker_set_key" : "android::base::LogSeverity",
    "name" : "android::base::LogSeverity",
-   "referenced_type" : "type-3997",
-   "self_type" : "type-3997",
+   "referenced_type" : "type-4657",
+   "self_type" : "type-4657",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "underlying_type" : "type-2",
@@ -9147,8 +9144,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-2850",
-   "self_type" : "type-2850",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "underlying_type" : "type-4",
@@ -12141,8 +12138,8 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1685",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
    "underlying_type" : "type-2",
@@ -12161,9 +12158,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1368",
-   "return_type" : "type-1365",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-1506",
+   "return_type" : "type-1498",
+   "self_type" : "type-1506",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12176,12 +12173,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1596"
     }
    ],
-   "referenced_type" : "type-1655",
-   "return_type" : "type-1365",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-2384",
+   "return_type" : "type-1498",
+   "self_type" : "type-2384",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12194,7 +12191,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-2378"
     },
     {
      "referenced_type" : "type-2"
@@ -12206,9 +12203,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-1651",
-   "return_type" : "type-1365",
-   "self_type" : "type-1651",
+   "referenced_type" : "type-2380",
+   "return_type" : "type-1498",
+   "self_type" : "type-2380",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12221,7 +12218,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-2378"
     },
     {
      "referenced_type" : "type-2"
@@ -12236,9 +12233,9 @@
      "referenced_type" : "type-91"
     }
    ],
-   "referenced_type" : "type-1648",
-   "return_type" : "type-1365",
-   "self_type" : "type-1648",
+   "referenced_type" : "type-2377",
+   "return_type" : "type-1498",
+   "self_type" : "type-2377",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12251,7 +12248,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-2378"
     },
     {
      "referenced_type" : "type-2"
@@ -12263,9 +12260,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1660",
-   "return_type" : "type-1365",
-   "self_type" : "type-1660",
+   "referenced_type" : "type-2389",
+   "return_type" : "type-1498",
+   "self_type" : "type-2389",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12278,15 +12275,15 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1658"
+     "referenced_type" : "type-2387"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1657",
-   "return_type" : "type-1365",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-2386",
+   "return_type" : "type-1498",
+   "self_type" : "type-2386",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12299,7 +12296,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1362"
+     "referenced_type" : "type-1486"
     },
     {
      "referenced_type" : "type-2"
@@ -12308,9 +12305,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1635",
-   "return_type" : "type-1365",
-   "self_type" : "type-1635",
+   "referenced_type" : "type-2364",
+   "return_type" : "type-1498",
+   "self_type" : "type-2364",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12323,15 +12320,15 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-1485"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1637",
-   "return_type" : "type-1365",
-   "self_type" : "type-1637",
+   "referenced_type" : "type-2366",
+   "return_type" : "type-1498",
+   "self_type" : "type-2366",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12344,12 +12341,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1643"
+     "referenced_type" : "type-2372"
     }
    ],
-   "referenced_type" : "type-1642",
-   "return_type" : "type-1365",
-   "self_type" : "type-1642",
+   "referenced_type" : "type-2371",
+   "return_type" : "type-1498",
+   "self_type" : "type-2371",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12365,12 +12362,12 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-1640"
+     "referenced_type" : "type-2369"
     }
    ],
-   "referenced_type" : "type-1639",
-   "return_type" : "type-1365",
-   "self_type" : "type-1639",
+   "referenced_type" : "type-2368",
+   "return_type" : "type-1498",
+   "self_type" : "type-2368",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12386,18 +12383,18 @@
      "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-1632"
+     "referenced_type" : "type-2361"
     },
     {
-     "referenced_type" : "type-1632"
+     "referenced_type" : "type-2361"
     },
     {
-     "referenced_type" : "type-1633"
+     "referenced_type" : "type-2362"
     }
    ],
-   "referenced_type" : "type-1631",
-   "return_type" : "type-1365",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-2360",
+   "return_type" : "type-1498",
+   "self_type" : "type-2360",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12416,9 +12413,9 @@
      "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-1662",
-   "return_type" : "type-1365",
-   "self_type" : "type-1662",
+   "referenced_type" : "type-2391",
+   "return_type" : "type-1498",
+   "self_type" : "type-2391",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12434,12 +12431,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1596"
     }
    ],
-   "referenced_type" : "type-1653",
-   "return_type" : "type-1365",
-   "self_type" : "type-1653",
+   "referenced_type" : "type-2382",
+   "return_type" : "type-1498",
+   "self_type" : "type-2382",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12461,12 +12458,12 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1646"
+     "referenced_type" : "type-2375"
     }
    ],
-   "referenced_type" : "type-1645",
-   "return_type" : "type-1365",
-   "self_type" : "type-1645",
+   "referenced_type" : "type-2374",
+   "return_type" : "type-1498",
+   "self_type" : "type-2374",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -12482,12 +12479,12 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1596"
     }
    ],
-   "referenced_type" : "type-1384",
-   "return_type" : "type-1365",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1595",
+   "return_type" : "type-1498",
+   "self_type" : "type-1595",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12503,7 +12500,7 @@
      "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1590"
     },
     {
      "referenced_type" : "type-2"
@@ -12515,9 +12512,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1382",
-   "return_type" : "type-1365",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1593",
+   "return_type" : "type-1498",
+   "self_type" : "type-1593",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -12551,15 +12548,15 @@
      "referenced_type" : "type-1247"
     },
     {
-     "referenced_type" : "type-2847"
+     "referenced_type" : "type-1389"
     },
     {
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2845",
+   "referenced_type" : "type-1388",
    "return_type" : "type-95",
-   "self_type" : "type-2845",
+   "self_type" : "type-1388",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -12614,7 +12611,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2839"
+     "referenced_type" : "type-1382"
     },
     {
      "referenced_type" : "type-99"
@@ -12632,9 +12629,9 @@
      "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-2838",
+   "referenced_type" : "type-1381",
    "return_type" : "type-9",
-   "self_type" : "type-2838",
+   "self_type" : "type-1381",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
@@ -12662,7 +12659,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-3843"
+     "referenced_type" : "type-4503"
     }
    ],
    "return_type" : "type-52",
@@ -12969,7 +12966,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-2192"
     }
    ],
    "return_type" : "type-9",
@@ -13315,7 +13312,7 @@
      "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-1767"
+     "referenced_type" : "type-2494"
     },
     {
      "referenced_type" : "type-4"
@@ -13424,13 +13421,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1801"
+     "referenced_type" : "type-2524"
     },
     {
      "referenced_type" : "type-725"
     }
    ],
-   "return_type" : "type-1807",
+   "return_type" : "type-2528",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13440,13 +13437,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1801"
+     "referenced_type" : "type-2524"
     },
     {
-     "referenced_type" : "type-1804"
+     "referenced_type" : "type-1863"
     }
    ],
-   "return_type" : "type-1807",
+   "return_type" : "type-2528",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -13457,7 +13454,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1958"
+     "referenced_type" : "type-2675"
     },
     {
      "referenced_type" : "type-12"
@@ -13477,7 +13474,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1958"
+     "referenced_type" : "type-2675"
     },
     {
      "referenced_type" : "type-8"
@@ -13497,7 +13494,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1958"
+     "referenced_type" : "type-2675"
     },
     {
      "referenced_type" : "type-8"
@@ -13517,7 +13514,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1958"
+     "referenced_type" : "type-2675"
     },
     {
      "referenced_type" : "type-8"
@@ -13540,7 +13537,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1958"
+     "referenced_type" : "type-2675"
     },
     {
      "referenced_type" : "type-8"
@@ -13563,7 +13560,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1958"
+     "referenced_type" : "type-2675"
     },
     {
      "referenced_type" : "type-8"
@@ -13586,7 +13583,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1958"
+     "referenced_type" : "type-2675"
     },
     {
      "referenced_type" : "type-8"
@@ -13609,7 +13606,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1961"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-12"
@@ -13629,7 +13626,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1961"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13649,7 +13646,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1961"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13669,7 +13666,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1961"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13692,7 +13689,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1961"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13715,7 +13712,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1961"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13738,7 +13735,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1961"
+     "referenced_type" : "type-2678"
     },
     {
      "referenced_type" : "type-8"
@@ -13761,7 +13758,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1953"
+     "referenced_type" : "type-2670"
     },
     {
      "referenced_type" : "type-12"
@@ -13781,7 +13778,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1953"
+     "referenced_type" : "type-2670"
     },
     {
      "referenced_type" : "type-8"
@@ -13801,7 +13798,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1953"
+     "referenced_type" : "type-2670"
     },
     {
      "referenced_type" : "type-8"
@@ -13821,7 +13818,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1953"
+     "referenced_type" : "type-2670"
     },
     {
      "referenced_type" : "type-8"
@@ -13844,7 +13841,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1953"
+     "referenced_type" : "type-2670"
     },
     {
      "referenced_type" : "type-8"
@@ -13867,7 +13864,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1953"
+     "referenced_type" : "type-2670"
     },
     {
      "referenced_type" : "type-8"
@@ -13890,7 +13887,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1953"
+     "referenced_type" : "type-2670"
     },
     {
      "referenced_type" : "type-8"
@@ -13912,10 +13909,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2549"
     }
    ],
-   "return_type" : "type-1751",
+   "return_type" : "type-2478",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13925,7 +13922,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2549"
     }
    ],
    "return_type" : "type-570",
@@ -13938,10 +13935,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1828"
+     "referenced_type" : "type-2549"
     }
    ],
-   "return_type" : "type-1738",
+   "return_type" : "type-2465",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -13951,15 +13948,15 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2964"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-3081"
+     "referenced_type" : "type-1649"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4765" ]
+   "template_args" : [ "type-3128" ]
   },
   {
    "function_name" : "android::Parcel::readNullableStrongBinder",
@@ -13968,15 +13965,15 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2964"
+     "referenced_type" : "type-1514"
     },
     {
-     "referenced_type" : "type-1815"
+     "referenced_type" : "type-2536"
     }
    ],
    "return_type" : "type-4",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-4768" ]
+   "template_args" : [ "type-3131" ]
   },
   {
    "access" : "protected",
@@ -14250,7 +14247,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1974"
+     "referenced_type" : "type-2691"
     },
     {
      "referenced_type" : "type-8"
@@ -14270,7 +14267,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1974"
+     "referenced_type" : "type-2691"
     },
     {
      "referenced_type" : "type-8"
@@ -14290,7 +14287,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1974"
+     "referenced_type" : "type-2691"
     },
     {
      "referenced_type" : "type-8"
@@ -14313,7 +14310,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1974"
+     "referenced_type" : "type-2691"
     },
     {
      "referenced_type" : "type-8"
@@ -14336,7 +14333,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1974"
+     "referenced_type" : "type-2691"
     },
     {
      "referenced_type" : "type-8"
@@ -14359,7 +14356,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1974"
+     "referenced_type" : "type-2691"
     },
     {
      "referenced_type" : "type-8"
@@ -14396,7 +14393,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-3843"
+     "referenced_type" : "type-4503"
     }
    ],
    "return_type" : "type-52",
@@ -14419,8 +14416,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-2697",
-   "self_type" : "type-2696",
+   "referenced_type" : "type-3797",
+   "self_type" : "type-3796",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14428,8 +14425,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-5770",
-   "self_type" : "type-5769",
+   "referenced_type" : "type-5872",
+   "self_type" : "type-5871",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14437,8 +14434,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-6646",
-   "self_type" : "type-6645",
+   "referenced_type" : "type-6418",
+   "self_type" : "type-6417",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14446,8 +14443,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-3099",
-   "self_type" : "type-3267",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1854",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14455,8 +14452,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-6099",
-   "self_type" : "type-6108",
+   "referenced_type" : "type-4126",
+   "self_type" : "type-4135",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14464,8 +14461,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *&",
    "name" : "android::BufferItem *&",
-   "referenced_type" : "type-6908",
-   "self_type" : "type-6915",
+   "referenced_type" : "type-6712",
+   "self_type" : "type-6726",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -14473,8 +14470,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-2892",
-   "self_type" : "type-2891",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14482,8 +14479,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-5934",
-   "self_type" : "type-5933",
+   "referenced_type" : "type-3961",
+   "self_type" : "type-3960",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14491,8 +14488,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::CompositorTiming &",
    "name" : "android::CompositorTiming &",
-   "referenced_type" : "type-6773",
-   "self_type" : "type-6772",
+   "referenced_type" : "type-6554",
+   "self_type" : "type-6553",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14500,8 +14497,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14509,8 +14506,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-3757",
-   "self_type" : "type-3756",
+   "referenced_type" : "type-4416",
+   "self_type" : "type-4415",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14518,8 +14515,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4014",
-   "self_type" : "type-4013",
+   "referenced_type" : "type-4674",
+   "self_type" : "type-4673",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14527,8 +14524,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-4278",
-   "self_type" : "type-4277",
+   "referenced_type" : "type-4942",
+   "self_type" : "type-4941",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14536,8 +14533,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-6226",
-   "self_type" : "type-6225",
+   "referenced_type" : "type-6015",
+   "self_type" : "type-6014",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14545,8 +14542,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7069",
-   "self_type" : "type-7068",
+   "referenced_type" : "type-7019",
+   "self_type" : "type-7018",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14554,8 +14551,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7165",
-   "self_type" : "type-7164",
+   "referenced_type" : "type-7203",
+   "self_type" : "type-7202",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14563,8 +14560,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence &",
    "name" : "android::Fence &",
-   "referenced_type" : "type-7420",
-   "self_type" : "type-7419",
+   "referenced_type" : "type-7315",
+   "self_type" : "type-7314",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14572,8 +14569,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-3928",
-   "self_type" : "type-3927",
+   "referenced_type" : "type-4588",
+   "self_type" : "type-4587",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14581,8 +14578,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7332",
-   "self_type" : "type-7331",
+   "referenced_type" : "type-7225",
+   "self_type" : "type-7224",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14591,7 +14588,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> &",
    "name" : "android::Flattenable<android::BufferItem> &",
    "referenced_type" : "type-22",
-   "self_type" : "type-2965",
+   "self_type" : "type-1515",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14600,7 +14597,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> &",
    "name" : "android::Flattenable<android::Fence> &",
    "referenced_type" : "type-17",
-   "self_type" : "type-3084",
+   "self_type" : "type-1652",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14609,7 +14606,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> &",
    "referenced_type" : "type-26",
-   "self_type" : "type-3670",
+   "self_type" : "type-4328",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14618,7 +14615,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> &",
    "name" : "android::Flattenable<android::GraphicBuffer> &",
    "referenced_type" : "type-15",
-   "self_type" : "type-3083",
+   "self_type" : "type-1651",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14627,7 +14624,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "referenced_type" : "type-33",
-   "self_type" : "type-3672",
+   "self_type" : "type-4330",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14636,7 +14633,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "referenced_type" : "type-35",
-   "self_type" : "type-3671",
+   "self_type" : "type-4329",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14644,8 +14641,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-1665",
-   "self_type" : "type-1664",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2392",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14653,8 +14650,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-3562",
-   "self_type" : "type-3561",
+   "referenced_type" : "type-4220",
+   "self_type" : "type-4219",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14662,8 +14659,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4022",
-   "self_type" : "type-4021",
+   "referenced_type" : "type-4682",
+   "self_type" : "type-4681",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14671,8 +14668,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-4110",
-   "self_type" : "type-4109",
+   "referenced_type" : "type-4772",
+   "self_type" : "type-4771",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14680,8 +14677,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6200",
-   "self_type" : "type-6199",
+   "referenced_type" : "type-5989",
+   "self_type" : "type-5988",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14689,8 +14686,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6623",
-   "self_type" : "type-6622",
+   "referenced_type" : "type-6814",
+   "self_type" : "type-6813",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14698,8 +14695,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-6961",
-   "self_type" : "type-6960",
+   "referenced_type" : "type-6835",
+   "self_type" : "type-6834",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14707,8 +14704,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer &",
    "name" : "android::GraphicBuffer &",
-   "referenced_type" : "type-7427",
-   "self_type" : "type-7426",
+   "referenced_type" : "type-7322",
+   "self_type" : "type-7321",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14734,8 +14731,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2151",
-   "self_type" : "type-2150",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1410",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14743,8 +14740,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2363",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-1447",
+   "self_type" : "type-1446",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14752,8 +14749,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14761,44 +14758,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2541",
-   "self_type" : "type-2540",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2598",
-   "self_type" : "type-2597",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2722",
-   "self_type" : "type-2721",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2870",
-   "self_type" : "type-2869",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper &",
-   "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-2911",
-   "self_type" : "type-2910",
+   "referenced_type" : "type-3251",
+   "self_type" : "type-3250",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14815,8 +14776,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3552",
-   "self_type" : "type-3551",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3462",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14824,8 +14785,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3730",
-   "self_type" : "type-3729",
+   "referenced_type" : "type-3530",
+   "self_type" : "type-3529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14833,8 +14794,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-3941",
-   "self_type" : "type-3940",
+   "referenced_type" : "type-3641",
+   "self_type" : "type-3640",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14842,8 +14803,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4106",
-   "self_type" : "type-4105",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3697",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14851,8 +14812,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-4890",
-   "self_type" : "type-4889",
+   "referenced_type" : "type-3822",
+   "self_type" : "type-3821",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14860,8 +14821,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5036",
-   "self_type" : "type-5035",
+   "referenced_type" : "type-3939",
+   "self_type" : "type-3938",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14869,8 +14830,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5124",
-   "self_type" : "type-5123",
+   "referenced_type" : "type-3980",
+   "self_type" : "type-3979",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14878,8 +14839,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5224",
-   "self_type" : "type-5223",
+   "referenced_type" : "type-4210",
+   "self_type" : "type-4209",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14887,8 +14848,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5436",
-   "self_type" : "type-5435",
+   "referenced_type" : "type-4389",
+   "self_type" : "type-4388",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14896,8 +14857,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5503",
-   "self_type" : "type-5502",
+   "referenced_type" : "type-4601",
+   "self_type" : "type-4600",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14905,8 +14866,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5614",
-   "self_type" : "type-5613",
+   "referenced_type" : "type-4768",
+   "self_type" : "type-4767",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14914,8 +14875,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5671",
-   "self_type" : "type-5670",
+   "referenced_type" : "type-5095",
+   "self_type" : "type-5094",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14923,8 +14884,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5795",
-   "self_type" : "type-5794",
+   "referenced_type" : "type-5163",
+   "self_type" : "type-5162",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14932,8 +14893,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5912",
-   "self_type" : "type-5911",
+   "referenced_type" : "type-5326",
+   "self_type" : "type-5325",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14941,8 +14902,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-5953",
-   "self_type" : "type-5952",
+   "referenced_type" : "type-5538",
+   "self_type" : "type-5537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14950,8 +14911,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6183",
-   "self_type" : "type-6182",
+   "referenced_type" : "type-5605",
+   "self_type" : "type-5604",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14959,8 +14920,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6266",
-   "self_type" : "type-6265",
+   "referenced_type" : "type-5716",
+   "self_type" : "type-5715",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14968,8 +14929,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6343",
-   "self_type" : "type-6342",
+   "referenced_type" : "type-5773",
+   "self_type" : "type-5772",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14977,8 +14938,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6393",
-   "self_type" : "type-6392",
+   "referenced_type" : "type-5897",
+   "self_type" : "type-5896",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14986,8 +14947,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6494",
-   "self_type" : "type-6493",
+   "referenced_type" : "type-6058",
+   "self_type" : "type-6057",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -14995,8 +14956,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6543",
-   "self_type" : "type-6542",
+   "referenced_type" : "type-6141",
+   "self_type" : "type-6140",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15004,8 +14965,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6657",
-   "self_type" : "type-6656",
+   "referenced_type" : "type-6193",
+   "self_type" : "type-6192",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15013,8 +14974,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6753",
-   "self_type" : "type-6752",
+   "referenced_type" : "type-6287",
+   "self_type" : "type-6286",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15022,8 +14983,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6792",
-   "self_type" : "type-6791",
+   "referenced_type" : "type-6331",
+   "self_type" : "type-6330",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15031,8 +14992,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-6955",
-   "self_type" : "type-6954",
+   "referenced_type" : "type-6426",
+   "self_type" : "type-6425",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15040,8 +15001,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7134",
-   "self_type" : "type-7133",
+   "referenced_type" : "type-6532",
+   "self_type" : "type-6531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15049,8 +15010,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7347",
-   "self_type" : "type-7346",
+   "referenced_type" : "type-6569",
+   "self_type" : "type-6568",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15058,8 +15019,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-7489",
-   "self_type" : "type-7488",
+   "referenced_type" : "type-6816",
+   "self_type" : "type-6815",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6988",
+   "self_type" : "type-6987",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7240",
+   "self_type" : "type-7239",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7378",
+   "self_type" : "type-7377",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15076,6 +15064,15 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7602",
+   "self_type" : "type-7601",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
    "referenced_type" : "type-841",
    "self_type" : "type-840",
    "size" : 8,
@@ -15157,8 +15154,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-2373",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-3473",
+   "self_type" : "type-3472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15166,8 +15163,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-3648",
-   "self_type" : "type-3647",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4305",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15175,8 +15172,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-4098",
-   "self_type" : "type-4097",
+   "referenced_type" : "type-4758",
+   "self_type" : "type-4757",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15184,8 +15181,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-5446",
-   "self_type" : "type-5445",
+   "referenced_type" : "type-5548",
+   "self_type" : "type-5547",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15193,8 +15190,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-6351",
-   "self_type" : "type-6350",
+   "referenced_type" : "type-6149",
+   "self_type" : "type-6148",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15202,8 +15199,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-7050",
-   "self_type" : "type-7049",
+   "referenced_type" : "type-6911",
+   "self_type" : "type-6910",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15211,8 +15208,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-7480",
-   "self_type" : "type-7479",
+   "referenced_type" : "type-7371",
+   "self_type" : "type-7370",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15230,7 +15227,7 @@
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
    "referenced_type" : "type-1240",
-   "self_type" : "type-1945",
+   "self_type" : "type-2662",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15239,7 +15236,7 @@
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
    "referenced_type" : "type-123",
-   "self_type" : "type-1938",
+   "self_type" : "type-2656",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15247,8 +15244,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 *&",
    "name" : "android::String8 *&",
-   "referenced_type" : "type-1940",
-   "self_type" : "type-3290",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -15283,8 +15280,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2069",
-   "self_type" : "type-2068",
+   "referenced_type" : "type-1366",
+   "self_type" : "type-1365",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15292,8 +15289,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1451",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15301,8 +15298,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2545",
-   "self_type" : "type-2544",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1524",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15310,8 +15307,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2607",
-   "self_type" : "type-2606",
+   "referenced_type" : "type-1666",
+   "self_type" : "type-1665",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15319,8 +15316,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2708",
-   "self_type" : "type-2707",
+   "referenced_type" : "type-3169",
+   "self_type" : "type-3168",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15328,8 +15325,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2821",
-   "self_type" : "type-2820",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15337,8 +15334,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2917",
-   "self_type" : "type-2916",
+   "referenced_type" : "type-3645",
+   "self_type" : "type-3644",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15346,8 +15343,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-2975",
-   "self_type" : "type-2974",
+   "referenced_type" : "type-3707",
+   "self_type" : "type-3706",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15355,8 +15352,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3096",
-   "self_type" : "type-3095",
+   "referenced_type" : "type-3808",
+   "self_type" : "type-3807",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15364,8 +15361,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3690",
-   "self_type" : "type-3689",
+   "referenced_type" : "type-3913",
+   "self_type" : "type-3912",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15373,8 +15370,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3827",
-   "self_type" : "type-3826",
+   "referenced_type" : "type-3986",
+   "self_type" : "type-3985",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15382,8 +15379,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3874",
-   "self_type" : "type-3873",
+   "referenced_type" : "type-4038",
+   "self_type" : "type-4037",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15391,8 +15388,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3896",
-   "self_type" : "type-3895",
+   "referenced_type" : "type-4123",
+   "self_type" : "type-4122",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15400,8 +15397,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-3936",
-   "self_type" : "type-3935",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4347",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15409,8 +15406,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4112",
-   "self_type" : "type-4111",
+   "referenced_type" : "type-4487",
+   "self_type" : "type-4486",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15418,8 +15415,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4199",
-   "self_type" : "type-4198",
+   "referenced_type" : "type-4534",
+   "self_type" : "type-4533",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15427,8 +15424,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4790",
-   "self_type" : "type-4789",
+   "referenced_type" : "type-4556",
+   "self_type" : "type-4555",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15436,8 +15433,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4888",
-   "self_type" : "type-4887",
+   "referenced_type" : "type-4596",
+   "self_type" : "type-4595",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15445,8 +15442,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4918",
-   "self_type" : "type-4917",
+   "referenced_type" : "type-4774",
+   "self_type" : "type-4773",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15454,8 +15451,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-4959",
-   "self_type" : "type-4958",
+   "referenced_type" : "type-4861",
+   "self_type" : "type-4860",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15463,17 +15460,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5032",
-   "self_type" : "type-5031",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::TextOutput &",
-   "name" : "android::TextOutput &",
-   "referenced_type" : "type-5092",
-   "self_type" : "type-5091",
+   "referenced_type" : "type-5093",
+   "self_type" : "type-5092",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15490,8 +15478,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5508",
-   "self_type" : "type-5507",
+   "referenced_type" : "type-5169",
+   "self_type" : "type-5168",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15499,8 +15487,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5618",
-   "self_type" : "type-5617",
+   "referenced_type" : "type-5244",
+   "self_type" : "type-5243",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15508,8 +15496,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5680",
-   "self_type" : "type-5679",
+   "referenced_type" : "type-5610",
+   "self_type" : "type-5609",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15517,8 +15505,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5781",
-   "self_type" : "type-5780",
+   "referenced_type" : "type-5720",
+   "self_type" : "type-5719",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15526,8 +15514,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5886",
-   "self_type" : "type-5885",
+   "referenced_type" : "type-5782",
+   "self_type" : "type-5781",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15535,8 +15523,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-5959",
-   "self_type" : "type-5958",
+   "referenced_type" : "type-5883",
+   "self_type" : "type-5882",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15544,8 +15532,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6011",
-   "self_type" : "type-6010",
+   "referenced_type" : "type-6051",
+   "self_type" : "type-6050",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15553,8 +15541,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6096",
-   "self_type" : "type-6095",
+   "referenced_type" : "type-6197",
+   "self_type" : "type-6196",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15562,8 +15550,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6259",
-   "self_type" : "type-6258",
+   "referenced_type" : "type-6293",
+   "self_type" : "type-6292",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15571,8 +15559,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6399",
-   "self_type" : "type-6398",
+   "referenced_type" : "type-6337",
+   "self_type" : "type-6336",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15580,8 +15568,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6499",
-   "self_type" : "type-6498",
+   "referenced_type" : "type-6420",
+   "self_type" : "type-6419",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15589,8 +15577,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6552",
-   "self_type" : "type-6551",
+   "referenced_type" : "type-6506",
+   "self_type" : "type-6505",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15598,8 +15586,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6649",
-   "self_type" : "type-6648",
+   "referenced_type" : "type-6574",
+   "self_type" : "type-6573",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15607,8 +15595,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6739",
-   "self_type" : "type-6738",
+   "referenced_type" : "type-6626",
+   "self_type" : "type-6625",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15616,8 +15604,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6799",
-   "self_type" : "type-6798",
+   "referenced_type" : "type-6709",
+   "self_type" : "type-6708",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15625,17 +15613,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-6838",
-   "self_type" : "type-6837",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::TextOutput &",
-   "name" : "android::TextOutput &",
-   "referenced_type" : "type-6906",
-   "self_type" : "type-6905",
+   "referenced_type" : "type-6944",
+   "self_type" : "type-6943",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15652,8 +15631,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7226",
-   "self_type" : "type-7225",
+   "referenced_type" : "type-7147",
+   "self_type" : "type-7146",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15661,8 +15640,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7271",
-   "self_type" : "type-7270",
+   "referenced_type" : "type-7177",
+   "self_type" : "type-7176",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15670,8 +15649,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7288",
-   "self_type" : "type-7287",
+   "referenced_type" : "type-7233",
+   "self_type" : "type-7232",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15679,8 +15658,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7341",
-   "self_type" : "type-7340",
+   "referenced_type" : "type-7383",
+   "self_type" : "type-7382",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15688,8 +15667,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7493",
-   "self_type" : "type-7492",
+   "referenced_type" : "type-7462",
+   "self_type" : "type-7461",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15697,8 +15676,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-7588",
-   "self_type" : "type-7587",
+   "referenced_type" : "type-7497",
+   "self_type" : "type-7496",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7600",
+   "self_type" : "type-7599",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7630",
+   "self_type" : "type-7629",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15733,8 +15730,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> &",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> &",
-   "referenced_type" : "type-4809",
-   "self_type" : "type-4812",
+   "referenced_type" : "type-7522",
+   "self_type" : "type-7525",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15742,8 +15739,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> > &",
-   "referenced_type" : "type-3704",
-   "self_type" : "type-3707",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4365",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15751,8 +15748,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> > &",
-   "referenced_type" : "type-3831",
-   "self_type" : "type-3834",
+   "referenced_type" : "type-4491",
+   "self_type" : "type-4494",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15760,8 +15757,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> > &",
-   "referenced_type" : "type-3710",
-   "self_type" : "type-3713",
+   "referenced_type" : "type-4368",
+   "self_type" : "type-4371",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15769,8 +15766,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > &",
-   "referenced_type" : "type-3837",
-   "self_type" : "type-3840",
+   "referenced_type" : "type-4497",
+   "self_type" : "type-4500",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15778,8 +15775,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3701",
+   "referenced_type" : "type-4356",
+   "self_type" : "type-4359",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15796,8 +15793,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<unsigned long> &",
    "name" : "android::hardware::Return<unsigned long> &",
-   "referenced_type" : "type-4813",
-   "self_type" : "type-4816",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7531",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15823,8 +15820,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2842",
-   "self_type" : "type-2841",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1384",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15832,8 +15829,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-5896",
-   "self_type" : "type-5895",
+   "referenced_type" : "type-3923",
+   "self_type" : "type-3922",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15841,8 +15838,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-6743",
-   "self_type" : "type-6742",
+   "referenced_type" : "type-6515",
+   "self_type" : "type-6514",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15860,7 +15857,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > &",
    "referenced_type" : "type-382",
-   "self_type" : "type-4929",
+   "self_type" : "type-7641",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15869,7 +15866,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> &",
    "referenced_type" : "type-373",
-   "self_type" : "type-3937",
+   "self_type" : "type-4597",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15878,7 +15875,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "referenced_type" : "type-391",
-   "self_type" : "type-3692",
+   "self_type" : "type-4350",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15887,7 +15884,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "referenced_type" : "type-588",
-   "self_type" : "type-3929",
+   "self_type" : "type-4589",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15896,7 +15893,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "referenced_type" : "type-360",
-   "self_type" : "type-3933",
+   "self_type" : "type-4593",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15905,7 +15902,7 @@
    "linker_set_key" : "android::hardware::hidl_array<int, 4> &",
    "name" : "android::hardware::hidl_array<int, 4> &",
    "referenced_type" : "type-385",
-   "self_type" : "type-4930",
+   "self_type" : "type-7642",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15923,7 +15920,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
    "referenced_type" : "type-453",
-   "self_type" : "type-3723",
+   "self_type" : "type-4382",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15932,7 +15929,7 @@
    "linker_set_key" : "android::hardware::media::V1_0::Rect &",
    "name" : "android::hardware::media::V1_0::Rect &",
    "referenced_type" : "type-376",
-   "self_type" : "type-3939",
+   "self_type" : "type-4599",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15941,7 +15938,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "referenced_type" : "type-164",
-   "self_type" : "type-1924",
+   "self_type" : "type-2644",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15950,7 +15947,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "referenced_type" : "type-150",
-   "self_type" : "type-1920",
+   "self_type" : "type-2640",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15959,7 +15956,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> &",
    "referenced_type" : "type-146",
-   "self_type" : "type-1919",
+   "self_type" : "type-2639",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15968,7 +15965,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "referenced_type" : "type-581",
-   "self_type" : "type-1787",
+   "self_type" : "type-2514",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15977,7 +15974,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &",
    "name" : "android::sp<android::ALooper> &",
    "referenced_type" : "type-322",
-   "self_type" : "type-1539",
+   "self_type" : "type-2268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15986,7 +15983,7 @@
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
    "referenced_type" : "type-259",
-   "self_type" : "type-1436",
+   "self_type" : "type-2079",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15995,7 +15992,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> &",
    "name" : "android::sp<android::ComponentWrapper> &",
    "referenced_type" : "type-567",
-   "self_type" : "type-1765",
+   "self_type" : "type-2492",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16003,8 +16000,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-2528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16013,7 +16010,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> &",
    "name" : "android::sp<android::FrameDropper> &",
    "referenced_type" : "type-578",
-   "self_type" : "type-1780",
+   "self_type" : "type-2507",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16031,7 +16028,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "referenced_type" : "type-473",
-   "self_type" : "type-1772",
+   "self_type" : "type-2499",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16039,8 +16036,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
    "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
-   "referenced_type" : "type-3604",
-   "self_type" : "type-3607",
+   "referenced_type" : "type-4262",
+   "self_type" : "type-4265",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16048,8 +16045,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
    "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
-   "referenced_type" : "type-3613",
-   "self_type" : "type-3616",
+   "referenced_type" : "type-4271",
+   "self_type" : "type-4274",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16057,8 +16054,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
    "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
-   "referenced_type" : "type-4168",
-   "self_type" : "type-4179",
+   "referenced_type" : "type-4830",
+   "self_type" : "type-4841",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16066,8 +16063,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
    "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
-   "referenced_type" : "type-5056",
-   "self_type" : "type-5066",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5118",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16120,8 +16117,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::NativeHandle> *&",
    "name" : "android::sp<android::NativeHandle> *&",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-3285",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16129,8 +16126,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> &",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> &",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-4939",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-7654",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16148,7 +16145,7 @@
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> &",
    "name" : "android::wp<android::IBinder::DeathRecipient> &",
    "referenced_type" : "type-174",
-   "self_type" : "type-3649",
+   "self_type" : "type-4307",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16157,7 +16154,7 @@
    "linker_set_key" : "android_cta861_3_metadata &",
    "name" : "android_cta861_3_metadata &",
    "referenced_type" : "type-306",
-   "self_type" : "type-2937",
+   "self_type" : "type-1477",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16175,7 +16172,7 @@
    "linker_set_key" : "android_smpte2086_metadata &",
    "name" : "android_smpte2086_metadata &",
    "referenced_type" : "type-305",
-   "self_type" : "type-2936",
+   "self_type" : "type-1476",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16192,8 +16189,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-1438",
-   "self_type" : "type-1513",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2242",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -16210,8 +16207,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-1531",
+   "self_type" : "type-1533",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-1672",
+   "self_type" : "type-1674",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3441",
+   "self_type" : "type-3443",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16219,8 +16234,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-2535",
-   "self_type" : "type-2539",
+   "referenced_type" : "type-3635",
+   "self_type" : "type-3639",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16228,8 +16243,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-2692",
-   "self_type" : "type-2695",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3795",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16237,8 +16252,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-2979",
-   "self_type" : "type-2981",
+   "referenced_type" : "type-4042",
+   "self_type" : "type-4044",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16246,8 +16261,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-3101",
-   "self_type" : "type-3103",
+   "referenced_type" : "type-4128",
+   "self_type" : "type-4130",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16255,8 +16270,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5414",
-   "self_type" : "type-5416",
+   "referenced_type" : "type-5516",
+   "self_type" : "type-5518",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16264,8 +16279,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5608",
-   "self_type" : "type-5612",
+   "referenced_type" : "type-5710",
+   "self_type" : "type-5714",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16273,8 +16288,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-5765",
-   "self_type" : "type-5768",
+   "referenced_type" : "type-5867",
+   "self_type" : "type-5870",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16282,26 +16297,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6015",
-   "self_type" : "type-6017",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::BufferItem &",
-   "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6101",
-   "self_type" : "type-6103",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::BufferItem &",
-   "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6326",
-   "self_type" : "type-6328",
+   "referenced_type" : "type-6122",
+   "self_type" : "type-6124",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -16309,8 +16306,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6487",
-   "self_type" : "type-6491",
+   "referenced_type" : "type-6281",
+   "self_type" : "type-6285",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16318,8 +16315,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6642",
-   "self_type" : "type-6644",
+   "referenced_type" : "type-6414",
+   "self_type" : "type-6416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16327,6 +16324,24 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6632",
+   "self_type" : "type-6634",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6714",
+   "self_type" : "type-6716",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
    "referenced_type" : "type-681",
    "self_type" : "type-683",
    "size" : 8,
@@ -16336,24 +16351,6 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6843",
-   "self_type" : "type-6845",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::BufferItem &",
-   "name" : "const android::BufferItem &",
-   "referenced_type" : "type-6911",
-   "self_type" : "type-6913",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::BufferItem &",
-   "name" : "const android::BufferItem &",
    "referenced_type" : "type-983",
    "self_type" : "type-987",
    "size" : 8,
@@ -16363,8 +16360,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-2885",
-   "self_type" : "type-2887",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1427",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16372,8 +16369,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-5927",
-   "self_type" : "type-5929",
+   "referenced_type" : "type-3954",
+   "self_type" : "type-3956",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16381,8 +16378,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::CompositorTiming &",
    "name" : "const android::CompositorTiming &",
-   "referenced_type" : "type-6769",
-   "self_type" : "type-6771",
+   "referenced_type" : "type-6547",
+   "self_type" : "type-6549",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16390,8 +16387,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-3922",
-   "self_type" : "type-3924",
+   "referenced_type" : "type-4582",
+   "self_type" : "type-4584",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16399,8 +16396,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-4091",
-   "self_type" : "type-4093",
+   "referenced_type" : "type-4751",
+   "self_type" : "type-4753",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16408,8 +16405,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7325",
-   "self_type" : "type-7328",
+   "referenced_type" : "type-7217",
+   "self_type" : "type-7219",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16417,8 +16414,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-7473",
-   "self_type" : "type-7475",
+   "referenced_type" : "type-7365",
+   "self_type" : "type-7367",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16426,8 +16423,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> &",
    "name" : "const android::Flattenable<android::BufferItem> &",
-   "referenced_type" : "type-2957",
-   "self_type" : "type-2963",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1513",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16435,8 +16432,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::Fence> &",
    "name" : "const android::Flattenable<android::Fence> &",
-   "referenced_type" : "type-3069",
-   "self_type" : "type-3079",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1648",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16444,8 +16441,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
-   "referenced_type" : "type-3651",
-   "self_type" : "type-3667",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4325",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16453,8 +16450,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> &",
    "name" : "const android::Flattenable<android::GraphicBuffer> &",
-   "referenced_type" : "type-3072",
-   "self_type" : "type-3078",
+   "referenced_type" : "type-1639",
+   "self_type" : "type-1647",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16462,8 +16459,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
-   "referenced_type" : "type-3654",
-   "self_type" : "type-3666",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4324",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16471,8 +16468,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
-   "referenced_type" : "type-3657",
-   "self_type" : "type-3668",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4326",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16534,8 +16531,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-3876",
-   "self_type" : "type-3875",
+   "referenced_type" : "type-4536",
+   "self_type" : "type-4535",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16543,8 +16540,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-7273",
-   "self_type" : "type-7272",
+   "referenced_type" : "type-7149",
+   "self_type" : "type-7148",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -16570,8 +16567,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1968",
-   "self_type" : "type-1970",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1492",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16579,8 +16576,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-1622",
+   "self_type" : "type-1624",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2685",
+   "self_type" : "type-2687",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3468",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16588,8 +16603,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2690",
+   "referenced_type" : "type-3788",
+   "self_type" : "type-3790",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16597,8 +16612,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-2945",
-   "self_type" : "type-2947",
+   "referenced_type" : "type-4013",
+   "self_type" : "type-4015",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16606,8 +16621,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3058",
-   "self_type" : "type-3060",
+   "referenced_type" : "type-4092",
+   "self_type" : "type-4094",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16615,8 +16630,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3637",
-   "self_type" : "type-3639",
+   "referenced_type" : "type-4295",
+   "self_type" : "type-4297",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16624,8 +16639,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-3915",
-   "self_type" : "type-3917",
+   "referenced_type" : "type-4575",
+   "self_type" : "type-4577",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16633,8 +16648,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4079",
-   "self_type" : "type-4082",
+   "referenced_type" : "type-4739",
+   "self_type" : "type-4742",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16642,8 +16657,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4354",
-   "self_type" : "type-4356",
+   "referenced_type" : "type-5022",
+   "self_type" : "type-5024",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16651,8 +16666,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-4870",
-   "self_type" : "type-4872",
+   "referenced_type" : "type-5080",
+   "self_type" : "type-5082",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16660,17 +16675,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5014",
-   "self_type" : "type-5016",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-5439",
-   "self_type" : "type-5441",
+   "referenced_type" : "type-5541",
+   "self_type" : "type-5543",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16678,8 +16684,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5761",
-   "self_type" : "type-5763",
+   "referenced_type" : "type-5863",
+   "self_type" : "type-5865",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16687,8 +16693,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-5986",
-   "self_type" : "type-5988",
+   "referenced_type" : "type-6046",
+   "self_type" : "type-6048",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16696,26 +16702,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6065",
-   "self_type" : "type-6067",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-6254",
-   "self_type" : "type-6256",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Rect &",
-   "name" : "const android::Rect &",
-   "referenced_type" : "type-6346",
-   "self_type" : "type-6348",
+   "referenced_type" : "type-6144",
+   "self_type" : "type-6146",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16723,8 +16711,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6637",
-   "self_type" : "type-6640",
+   "referenced_type" : "type-6410",
+   "self_type" : "type-6412",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16732,8 +16720,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6827",
-   "self_type" : "type-6829",
+   "referenced_type" : "type-6600",
+   "self_type" : "type-6602",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16741,8 +16729,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-6887",
-   "self_type" : "type-6889",
+   "referenced_type" : "type-6679",
+   "self_type" : "type-6681",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16750,8 +16738,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7037",
-   "self_type" : "type-7039",
+   "referenced_type" : "type-6899",
+   "self_type" : "type-6901",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16759,8 +16747,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7317",
-   "self_type" : "type-7319",
+   "referenced_type" : "type-7209",
+   "self_type" : "type-7211",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16768,8 +16756,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7463",
-   "self_type" : "type-7465",
+   "referenced_type" : "type-7356",
+   "self_type" : "type-7358",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16777,8 +16765,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-7585",
-   "self_type" : "type-7596",
+   "referenced_type" : "type-7582",
+   "self_type" : "type-7586",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16793,10 +16781,19 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7679",
+   "self_type" : "type-7686",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler &",
    "name" : "const android::SafeInterface::ParcelHandler &",
    "referenced_type" : "type-1266",
-   "self_type" : "type-3105",
+   "self_type" : "type-1676",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -16813,8 +16810,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1935",
-   "self_type" : "type-1937",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16831,8 +16828,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-2843",
-   "self_type" : "type-2844",
+   "referenced_type" : "type-1386",
+   "self_type" : "type-1387",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16867,8 +16864,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-3693",
-   "self_type" : "type-3913",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4573",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16876,8 +16873,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
-   "referenced_type" : "type-3925",
-   "self_type" : "type-3926",
+   "referenced_type" : "type-4585",
+   "self_type" : "type-4586",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16984,8 +16981,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > &",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-2621",
+   "self_type" : "type-2622",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16993,8 +16990,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > &",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2620",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17002,8 +16999,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int> &",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int> &",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-2615",
+   "self_type" : "type-2616",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17011,8 +17008,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-1683",
-   "self_type" : "type-1682",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2410",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17020,8 +17017,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-4186",
-   "self_type" : "type-4185",
+   "referenced_type" : "type-4848",
+   "self_type" : "type-4847",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17029,8 +17026,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-6205",
-   "self_type" : "type-6207",
+   "referenced_type" : "type-5994",
+   "self_type" : "type-5996",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17038,8 +17035,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-6670",
-   "self_type" : "type-6669",
+   "referenced_type" : "type-6830",
+   "self_type" : "type-6829",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -17048,7 +17045,7 @@
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "referenced_type" : "type-1311",
-   "self_type" : "type-1363",
+   "self_type" : "type-1487",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17065,8 +17062,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2192",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17074,8 +17071,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer> &",
    "name" : "const android::sp<android::BpGraphicBufferProducer> &",
-   "referenced_type" : "type-3572",
-   "self_type" : "type-3577",
+   "referenced_type" : "type-4230",
+   "self_type" : "type-4235",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17083,8 +17080,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::BpProducerListener> &",
    "name" : "const android::sp<android::BpProducerListener> &",
-   "referenced_type" : "type-3859",
-   "self_type" : "type-3860",
+   "referenced_type" : "type-4519",
+   "self_type" : "type-4520",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17101,8 +17098,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> &",
    "name" : "const android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-2493",
+   "self_type" : "type-2494",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17110,8 +17107,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-1802",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1863",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17120,7 +17117,7 @@
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
    "referenced_type" : "type-1197",
-   "self_type" : "type-1663",
+   "self_type" : "type-1861",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17137,8 +17134,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
-   "referenced_type" : "type-3609",
-   "self_type" : "type-3734",
+   "referenced_type" : "type-4267",
+   "self_type" : "type-4393",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17146,8 +17143,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
-   "referenced_type" : "type-3618",
-   "self_type" : "type-3735",
+   "referenced_type" : "type-4276",
+   "self_type" : "type-4394",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17155,8 +17152,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
-   "referenced_type" : "type-4167",
-   "self_type" : "type-4172",
+   "referenced_type" : "type-4829",
+   "self_type" : "type-4834",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17164,8 +17161,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
-   "referenced_type" : "type-5055",
-   "self_type" : "type-5060",
+   "referenced_type" : "type-5110",
+   "self_type" : "type-5115",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17173,8 +17170,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient> &",
    "name" : "const android::sp<android::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-3645",
-   "self_type" : "type-3646",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4304",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17209,8 +17206,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-1760",
-   "self_type" : "type-1761",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-2488",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17245,8 +17242,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-2848",
-   "self_type" : "type-2847",
+   "referenced_type" : "type-1390",
+   "self_type" : "type-1389",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17254,8 +17251,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> &",
-   "referenced_type" : "type-1743",
-   "self_type" : "type-3567",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-4225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17263,8 +17260,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> &",
-   "referenced_type" : "type-1733",
-   "self_type" : "type-3853",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-4513",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17272,8 +17269,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> &",
-   "referenced_type" : "type-3584",
-   "self_type" : "type-3589",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4247",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17281,8 +17278,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> &",
-   "referenced_type" : "type-3813",
-   "self_type" : "type-3862",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4522",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17290,8 +17287,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> &",
-   "referenced_type" : "type-1757",
-   "self_type" : "type-3568",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-4226",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17299,8 +17296,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> &",
-   "referenced_type" : "type-1749",
-   "self_type" : "type-3856",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-4516",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17308,8 +17305,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> &",
-   "referenced_type" : "type-3578",
-   "self_type" : "type-3583",
+   "referenced_type" : "type-4236",
+   "self_type" : "type-4241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17317,8 +17314,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> &",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> &",
-   "referenced_type" : "type-3806",
-   "self_type" : "type-3861",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4521",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17362,8 +17359,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient> &",
    "name" : "const android::wp<android::IBinder::DeathRecipient> &",
-   "referenced_type" : "type-3635",
-   "self_type" : "type-3640",
+   "referenced_type" : "type-4293",
+   "self_type" : "type-4298",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17371,8 +17368,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::IBinder> &",
    "name" : "const android::wp<android::IBinder> &",
-   "referenced_type" : "type-3625",
-   "self_type" : "type-3626",
+   "referenced_type" : "type-4283",
+   "self_type" : "type-4284",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17380,8 +17377,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android_cta861_3_metadata &",
    "name" : "const android_cta861_3_metadata &",
-   "referenced_type" : "type-2934",
-   "self_type" : "type-2935",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1474",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17398,8 +17395,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android_smpte2086_metadata &",
    "name" : "const android_smpte2086_metadata &",
-   "referenced_type" : "type-2932",
-   "self_type" : "type-2933",
+   "referenced_type" : "type-1471",
+   "self_type" : "type-1472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17444,7 +17441,7 @@
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
    "referenced_type" : "type-480",
-   "self_type" : "type-2962",
+   "self_type" : "type-1512",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17472,78 +17469,43 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2207",
-   "self_type" : "type-2209",
+   "referenced_type" : "type-3307",
+   "self_type" : "type-3309",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-3540",
+   "self_type" : "type-3542",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2549",
-   "self_type" : "type-2551",
+   "referenced_type" : "type-3649",
+   "self_type" : "type-3651",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2612",
-   "self_type" : "type-2614",
+   "referenced_type" : "type-3712",
+   "self_type" : "type-3714",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2734",
-   "self_type" : "type-2736",
+   "referenced_type" : "type-3834",
+   "self_type" : "type-3836",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3716",
-   "self_type" : "type-3718",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3844",
-   "self_type" : "type-3846",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3881",
-   "self_type" : "type-3883",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3906",
-   "self_type" : "type-3908",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4060",
-   "self_type" : "type-4062",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "linker_set_key" : "const iter<is_const> &",
-   "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4188",
-   "self_type" : "type-4190",
+   "referenced_type" : "type-4375",
+   "self_type" : "type-4377",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17556,155 +17518,190 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4776",
-   "self_type" : "type-4778",
+   "referenced_type" : "type-4504",
+   "self_type" : "type-4506",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4820",
-   "self_type" : "type-4822",
+   "referenced_type" : "type-4541",
+   "self_type" : "type-4543",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4902",
-   "self_type" : "type-4904",
+   "referenced_type" : "type-4566",
+   "self_type" : "type-4568",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-4965",
-   "self_type" : "type-4967",
+   "referenced_type" : "type-4720",
+   "self_type" : "type-4722",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-5075",
-   "self_type" : "type-5077",
+   "referenced_type" : "type-4850",
+   "self_type" : "type-4852",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-5141",
-   "self_type" : "type-5143",
+   "referenced_type" : "type-5123",
+   "self_type" : "type-5125",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-5280",
-   "self_type" : "type-5282",
+   "referenced_type" : "type-5176",
+   "self_type" : "type-5178",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-5513",
-   "self_type" : "type-5515",
+   "referenced_type" : "type-5382",
+   "self_type" : "type-5384",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-5622",
-   "self_type" : "type-5624",
+   "referenced_type" : "type-5615",
+   "self_type" : "type-5617",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-5685",
-   "self_type" : "type-5687",
+   "referenced_type" : "type-5724",
+   "self_type" : "type-5726",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-5807",
-   "self_type" : "type-5809",
+   "referenced_type" : "type-5787",
+   "self_type" : "type-5789",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-6275",
-   "self_type" : "type-6277",
+   "referenced_type" : "type-5909",
+   "self_type" : "type-5911",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-6407",
-   "self_type" : "type-6409",
+   "referenced_type" : "type-6067",
+   "self_type" : "type-6069",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-6503",
-   "self_type" : "type-6505",
+   "referenced_type" : "type-6201",
+   "self_type" : "type-6203",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-6559",
-   "self_type" : "type-6561",
+   "referenced_type" : "type-6297",
+   "self_type" : "type-6299",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-6666",
-   "self_type" : "type-6668",
+   "referenced_type" : "type-6341",
+   "self_type" : "type-6343",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-7118",
-   "self_type" : "type-7120",
+   "referenced_type" : "type-6433",
+   "self_type" : "type-6435",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-7242",
-   "self_type" : "type-7244",
+   "referenced_type" : "type-6972",
+   "self_type" : "type-6974",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-7277",
-   "self_type" : "type-7279",
+   "referenced_type" : "type-7106",
+   "self_type" : "type-7109",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-7305",
-   "self_type" : "type-7307",
+   "referenced_type" : "type-7159",
+   "self_type" : "type-7161",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-7449",
-   "self_type" : "type-7451",
+   "referenced_type" : "type-7195",
+   "self_type" : "type-7197",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-7571",
-   "self_type" : "type-7573",
+   "referenced_type" : "type-7345",
+   "self_type" : "type-7347",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7445",
+   "self_type" : "type-7447",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7482",
+   "self_type" : "type-7484",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7536",
+   "self_type" : "type-7538",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7616",
+   "self_type" : "type-7618",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7682",
+   "self_type" : "type-7684",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17718,8 +17715,8 @@
    "alignment" : 8,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1603",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2332",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -17754,8 +17751,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-1925",
-   "self_type" : "type-1928",
+   "referenced_type" : "type-2645",
+   "self_type" : "type-2648",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17763,8 +17760,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-4326",
-   "self_type" : "type-4328",
+   "referenced_type" : "type-4990",
+   "self_type" : "type-4992",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17772,8 +17769,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-6246",
-   "self_type" : "type-6248",
+   "referenced_type" : "type-6035",
+   "self_type" : "type-6037",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17781,8 +17778,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-7412",
-   "self_type" : "type-7416",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7532",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17790,8 +17787,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-1921",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-2641",
+   "self_type" : "type-2643",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17799,8 +17796,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-4322",
-   "self_type" : "type-4324",
+   "referenced_type" : "type-4986",
+   "self_type" : "type-4988",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17808,8 +17805,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-6243",
-   "self_type" : "type-6245",
+   "referenced_type" : "type-6032",
+   "self_type" : "type-6034",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17817,8 +17814,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-7397",
-   "self_type" : "type-7405",
+   "referenced_type" : "type-7512",
+   "self_type" : "type-7518",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17826,8 +17823,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
    "name" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
-   "referenced_type" : "type-3075",
-   "self_type" : "type-3077",
+   "referenced_type" : "type-1644",
+   "self_type" : "type-1646",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17835,8 +17832,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
    "name" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
-   "referenced_type" : "type-6079",
-   "self_type" : "type-6081",
+   "referenced_type" : "type-4106",
+   "self_type" : "type-4108",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17844,8 +17841,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
    "name" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > &",
-   "referenced_type" : "type-6897",
-   "self_type" : "type-6899",
+   "referenced_type" : "type-6693",
+   "self_type" : "type-6695",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17880,8 +17877,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-2172",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-3272",
+   "self_type" : "type-3271",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17889,8 +17886,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-2437",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-3537",
+   "self_type" : "type-3536",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17898,8 +17895,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-2547",
-   "self_type" : "type-2546",
+   "referenced_type" : "type-3647",
+   "self_type" : "type-3646",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17907,8 +17904,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-2610",
-   "self_type" : "type-2609",
+   "referenced_type" : "type-3710",
+   "self_type" : "type-3709",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17916,44 +17913,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-2732",
-   "self_type" : "type-2731",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3696",
-   "self_type" : "type-3695",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3829",
-   "self_type" : "type-3828",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3898",
-   "self_type" : "type-3897",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3962",
-   "self_type" : "type-3961",
+   "referenced_type" : "type-3832",
+   "self_type" : "type-3831",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17970,8 +17931,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-4002",
-   "self_type" : "type-4001",
+   "referenced_type" : "type-4354",
+   "self_type" : "type-4353",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17979,8 +17940,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-4208",
-   "self_type" : "type-4207",
+   "referenced_type" : "type-4489",
+   "self_type" : "type-4488",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17988,8 +17949,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-4792",
-   "self_type" : "type-4791",
+   "referenced_type" : "type-4558",
+   "self_type" : "type-4557",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17997,8 +17958,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-4797",
-   "self_type" : "type-4796",
+   "referenced_type" : "type-4622",
+   "self_type" : "type-4621",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18006,8 +17967,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-4921",
-   "self_type" : "type-4920",
+   "referenced_type" : "type-4662",
+   "self_type" : "type-4661",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18015,8 +17976,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-4932",
-   "self_type" : "type-4931",
+   "referenced_type" : "type-4870",
+   "self_type" : "type-4869",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18024,8 +17985,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-5104",
-   "self_type" : "type-5103",
+   "referenced_type" : "type-5142",
+   "self_type" : "type-5141",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18033,8 +17994,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-5137",
-   "self_type" : "type-5136",
+   "referenced_type" : "type-5171",
+   "self_type" : "type-5170",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18042,8 +18003,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-5245",
-   "self_type" : "type-5244",
+   "referenced_type" : "type-5347",
+   "self_type" : "type-5346",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18051,8 +18012,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-5510",
-   "self_type" : "type-5509",
+   "referenced_type" : "type-5612",
+   "self_type" : "type-5611",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18060,8 +18021,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-5620",
-   "self_type" : "type-5619",
+   "referenced_type" : "type-5722",
+   "self_type" : "type-5721",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18069,8 +18030,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-5683",
-   "self_type" : "type-5682",
+   "referenced_type" : "type-5785",
+   "self_type" : "type-5784",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18078,8 +18039,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-5805",
-   "self_type" : "type-5804",
+   "referenced_type" : "type-5907",
+   "self_type" : "type-5906",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18087,8 +18048,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-6270",
-   "self_type" : "type-6269",
+   "referenced_type" : "type-6062",
+   "self_type" : "type-6061",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18096,8 +18057,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-6403",
-   "self_type" : "type-6402",
+   "referenced_type" : "type-6199",
+   "self_type" : "type-6198",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18105,8 +18066,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-6501",
-   "self_type" : "type-6500",
+   "referenced_type" : "type-6295",
+   "self_type" : "type-6294",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18114,8 +18075,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-6555",
-   "self_type" : "type-6554",
+   "referenced_type" : "type-6339",
+   "self_type" : "type-6338",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18123,8 +18084,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-6663",
-   "self_type" : "type-6662",
+   "referenced_type" : "type-6431",
+   "self_type" : "type-6430",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18132,8 +18093,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-7098",
-   "self_type" : "type-7097",
+   "referenced_type" : "type-6952",
+   "self_type" : "type-6951",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18141,8 +18102,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-7229",
-   "self_type" : "type-7228",
+   "referenced_type" : "type-7091",
+   "self_type" : "type-7090",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18150,8 +18111,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-7290",
-   "self_type" : "type-7289",
+   "referenced_type" : "type-7179",
+   "self_type" : "type-7178",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18159,8 +18120,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-7367",
-   "self_type" : "type-7366",
+   "referenced_type" : "type-7262",
+   "self_type" : "type-7261",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18168,8 +18129,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-7409",
-   "self_type" : "type-7408",
+   "referenced_type" : "type-7306",
+   "self_type" : "type-7305",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18177,8 +18138,44 @@
    "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-7598",
-   "self_type" : "type-7597",
+   "referenced_type" : "type-7473",
+   "self_type" : "type-7472",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7499",
+   "self_type" : "type-7498",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7504",
+   "self_type" : "type-7503",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7632",
+   "self_type" : "type-7631",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7644",
+   "self_type" : "type-7643",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18195,8 +18192,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "type-3720",
-   "self_type" : "type-3722",
+   "referenced_type" : "type-4379",
+   "self_type" : "type-4381",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18204,8 +18201,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "type-3847",
-   "self_type" : "type-3849",
+   "referenced_type" : "type-4507",
+   "self_type" : "type-4509",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18213,8 +18210,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "type-7122",
-   "self_type" : "type-7124",
+   "referenced_type" : "type-6976",
+   "self_type" : "type-6979",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18222,8 +18219,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> > &",
-   "referenced_type" : "type-7245",
-   "self_type" : "type-7247",
+   "referenced_type" : "type-7110",
+   "self_type" : "type-7112",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18258,8 +18255,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-1794",
-   "self_type" : "type-1896",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2617",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18285,8 +18282,8 @@
    "alignment" : 8,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-2959",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1509",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18295,7 +18292,7 @@
    "linker_set_key" : "long &",
    "name" : "long &",
    "referenced_type" : "type-32",
-   "self_type" : "type-2890",
+   "self_type" : "type-1430",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18303,8 +18300,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-4101",
-   "self_type" : "type-4100",
+   "referenced_type" : "type-4761",
+   "self_type" : "type-4760",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18312,8 +18309,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-4203",
-   "self_type" : "type-4202",
+   "referenced_type" : "type-4865",
+   "self_type" : "type-4864",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18321,8 +18318,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-4882",
-   "self_type" : "type-4881",
+   "referenced_type" : "type-5084",
+   "self_type" : "type-5083",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18330,8 +18327,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-5018",
-   "self_type" : "type-5017",
+   "referenced_type" : "type-5137",
+   "self_type" : "type-5136",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18339,8 +18336,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-5097",
-   "self_type" : "type-5096",
+   "referenced_type" : "type-7373",
+   "self_type" : "type-7372",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18348,8 +18345,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-7483",
-   "self_type" : "type-7482",
+   "referenced_type" : "type-7467",
+   "self_type" : "type-7466",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18357,8 +18354,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-7592",
-   "self_type" : "type-7591",
+   "referenced_type" : "type-7594",
+   "self_type" : "type-7593",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -18375,8 +18372,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-3184",
+   "self_type" : "type-3183",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18384,8 +18381,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-5034",
-   "self_type" : "type-5033",
+   "referenced_type" : "type-5259",
+   "self_type" : "type-5258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18393,8 +18390,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-6261",
-   "self_type" : "type-6260",
+   "referenced_type" : "type-6053",
+   "self_type" : "type-6052",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18402,8 +18399,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
-   "referenced_type" : "type-3081",
-   "self_type" : "type-3288",
+   "referenced_type" : "type-1649",
+   "self_type" : "type-1884",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18411,8 +18408,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
-   "referenced_type" : "type-6085",
-   "self_type" : "type-6112",
+   "referenced_type" : "type-4112",
+   "self_type" : "type-4139",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18420,8 +18417,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&",
-   "referenced_type" : "type-6901",
-   "self_type" : "type-6917",
+   "referenced_type" : "type-6698",
+   "self_type" : "type-6730",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18430,7 +18427,7 @@
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
    "referenced_type" : "type-92",
-   "self_type" : "type-2889",
+   "self_type" : "type-1429",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18456,8 +18453,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long *&",
    "name" : "unsigned long *&",
-   "referenced_type" : "type-3107",
-   "self_type" : "type-3279",
+   "referenced_type" : "type-1679",
+   "self_type" : "type-1873",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18466,7 +18463,7 @@
    "linker_set_key" : "unsigned short &",
    "name" : "unsigned short &",
    "referenced_type" : "type-500",
-   "self_type" : "type-2888",
+   "self_type" : "type-1428",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18474,8 +18471,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-2909",
-   "self_type" : "type-2908",
+   "referenced_type" : "type-1445",
+   "self_type" : "type-1444",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18483,8 +18480,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-5951",
-   "self_type" : "type-5950",
+   "referenced_type" : "type-3978",
+   "self_type" : "type-3977",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18492,8 +18489,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-6789",
-   "self_type" : "type-6788",
+   "referenced_type" : "type-6567",
+   "self_type" : "type-6566",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18513,8 +18510,8 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2403",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18522,8 +18519,8 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-4174",
-   "self_type" : "type-4173",
+   "referenced_type" : "type-4836",
+   "self_type" : "type-4835",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18531,8 +18528,8 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-6202",
-   "self_type" : "type-6201",
+   "referenced_type" : "type-5991",
+   "self_type" : "type-5990",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18540,8 +18537,8 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-6651",
-   "self_type" : "type-6650",
+   "referenced_type" : "type-6825",
+   "self_type" : "type-6824",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -18576,8 +18573,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1893",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-1351",
+   "self_type" : "type-1350",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18585,8 +18582,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1407",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18594,8 +18591,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2483",
-   "self_type" : "type-2482",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1423",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18603,8 +18600,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2557",
-   "self_type" : "type-2556",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1439",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18612,8 +18609,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2647",
-   "self_type" : "type-2646",
+   "referenced_type" : "type-1503",
+   "self_type" : "type-1502",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18621,8 +18618,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2671",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-1633",
+   "self_type" : "type-1632",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18630,8 +18627,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2806",
-   "self_type" : "type-2805",
+   "referenced_type" : "type-2614",
+   "self_type" : "type-2613",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18639,8 +18636,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2868",
-   "self_type" : "type-2867",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18648,8 +18645,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2883",
-   "self_type" : "type-2882",
+   "referenced_type" : "type-3583",
+   "self_type" : "type-3582",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18657,8 +18654,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2904",
-   "self_type" : "type-2903",
+   "referenced_type" : "type-3657",
+   "self_type" : "type-3656",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18666,8 +18663,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2956",
-   "self_type" : "type-2955",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18675,8 +18672,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3068",
-   "self_type" : "type-3067",
+   "referenced_type" : "type-3771",
+   "self_type" : "type-3770",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18684,8 +18681,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3644",
-   "self_type" : "type-3643",
+   "referenced_type" : "type-3906",
+   "self_type" : "type-3905",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18693,8 +18690,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3815",
-   "self_type" : "type-3814",
+   "referenced_type" : "type-3937",
+   "self_type" : "type-3936",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18702,8 +18699,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3868",
-   "self_type" : "type-3867",
+   "referenced_type" : "type-3952",
+   "self_type" : "type-3951",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18711,8 +18708,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3894",
-   "self_type" : "type-3893",
+   "referenced_type" : "type-3973",
+   "self_type" : "type-3972",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18720,8 +18717,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3921",
-   "self_type" : "type-3920",
+   "referenced_type" : "type-4021",
+   "self_type" : "type-4020",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18729,8 +18726,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4088",
-   "self_type" : "type-4087",
+   "referenced_type" : "type-4099",
+   "self_type" : "type-4098",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18738,8 +18735,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4196",
-   "self_type" : "type-4195",
+   "referenced_type" : "type-4302",
+   "self_type" : "type-4301",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18747,8 +18744,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4306",
-   "self_type" : "type-4305",
+   "referenced_type" : "type-4475",
+   "self_type" : "type-4474",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18756,8 +18753,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4788",
-   "self_type" : "type-4787",
+   "referenced_type" : "type-4528",
+   "self_type" : "type-4527",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18765,8 +18762,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4879",
-   "self_type" : "type-4878",
+   "referenced_type" : "type-4554",
+   "self_type" : "type-4553",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18774,8 +18771,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-4915",
-   "self_type" : "type-4914",
+   "referenced_type" : "type-4581",
+   "self_type" : "type-4580",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18783,8 +18780,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5026",
-   "self_type" : "type-5025",
+   "referenced_type" : "type-4748",
+   "self_type" : "type-4747",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18792,8 +18789,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5088",
-   "self_type" : "type-5087",
+   "referenced_type" : "type-4858",
+   "self_type" : "type-4857",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18801,8 +18798,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5204",
-   "self_type" : "type-5203",
+   "referenced_type" : "type-4970",
+   "self_type" : "type-4969",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18810,8 +18807,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5452",
-   "self_type" : "type-5451",
+   "referenced_type" : "type-5090",
+   "self_type" : "type-5089",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18819,8 +18816,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5556",
-   "self_type" : "type-5555",
+   "referenced_type" : "type-5131",
+   "self_type" : "type-5130",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18828,8 +18825,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5630",
-   "self_type" : "type-5629",
+   "referenced_type" : "type-5237",
+   "self_type" : "type-5236",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18837,8 +18834,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5720",
-   "self_type" : "type-5719",
+   "referenced_type" : "type-5554",
+   "self_type" : "type-5553",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18846,8 +18843,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5744",
-   "self_type" : "type-5743",
+   "referenced_type" : "type-5658",
+   "self_type" : "type-5657",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18855,8 +18852,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5879",
-   "self_type" : "type-5878",
+   "referenced_type" : "type-5732",
+   "self_type" : "type-5731",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18864,8 +18861,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5910",
-   "self_type" : "type-5909",
+   "referenced_type" : "type-5822",
+   "self_type" : "type-5821",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18873,8 +18870,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5925",
-   "self_type" : "type-5924",
+   "referenced_type" : "type-5846",
+   "self_type" : "type-5845",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18882,8 +18879,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5946",
-   "self_type" : "type-5945",
+   "referenced_type" : "type-6030",
+   "self_type" : "type-6029",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18891,8 +18888,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-5994",
-   "self_type" : "type-5993",
+   "referenced_type" : "type-6153",
+   "self_type" : "type-6152",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18900,8 +18897,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6072",
-   "self_type" : "type-6071",
+   "referenced_type" : "type-6244",
+   "self_type" : "type-6243",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18909,8 +18906,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6241",
-   "self_type" : "type-6240",
+   "referenced_type" : "type-6305",
+   "self_type" : "type-6304",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18918,8 +18915,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6355",
-   "self_type" : "type-6354",
+   "referenced_type" : "type-6377",
+   "self_type" : "type-6376",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18927,8 +18924,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6450",
-   "self_type" : "type-6449",
+   "referenced_type" : "type-6399",
+   "self_type" : "type-6398",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18936,8 +18933,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6511",
-   "self_type" : "type-6510",
+   "referenced_type" : "type-6498",
+   "self_type" : "type-6497",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18945,8 +18942,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6595",
-   "self_type" : "type-6594",
+   "referenced_type" : "type-6529",
+   "self_type" : "type-6528",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18954,8 +18951,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6621",
-   "self_type" : "type-6620",
+   "referenced_type" : "type-6545",
+   "self_type" : "type-6544",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18963,8 +18960,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6734",
-   "self_type" : "type-6733",
+   "referenced_type" : "type-6562",
+   "self_type" : "type-6561",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18972,8 +18969,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6750",
-   "self_type" : "type-6749",
+   "referenced_type" : "type-6609",
+   "self_type" : "type-6608",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18981,8 +18978,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6768",
-   "self_type" : "type-6767",
+   "referenced_type" : "type-6686",
+   "self_type" : "type-6685",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18990,8 +18987,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6783",
-   "self_type" : "type-6782",
+   "referenced_type" : "type-6906",
+   "self_type" : "type-6905",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18999,8 +18996,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6834",
-   "self_type" : "type-6833",
+   "referenced_type" : "type-7074",
+   "self_type" : "type-7073",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19008,8 +19005,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-6895",
-   "self_type" : "type-6894",
+   "referenced_type" : "type-7138",
+   "self_type" : "type-7137",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19017,8 +19014,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7044",
-   "self_type" : "type-7043",
+   "referenced_type" : "type-7173",
+   "self_type" : "type-7172",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19026,8 +19023,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7218",
-   "self_type" : "type-7217",
+   "referenced_type" : "type-7216",
+   "self_type" : "type-7215",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19035,8 +19032,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7265",
-   "self_type" : "type-7264",
+   "referenced_type" : "type-7363",
+   "self_type" : "type-7362",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19044,8 +19041,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7286",
-   "self_type" : "type-7285",
+   "referenced_type" : "type-7454",
+   "self_type" : "type-7453",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19053,8 +19050,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7298",
-   "self_type" : "type-7297",
+   "referenced_type" : "type-7458",
+   "self_type" : "type-7457",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19062,8 +19059,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7324",
-   "self_type" : "type-7323",
+   "referenced_type" : "type-7495",
+   "self_type" : "type-7494",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19071,8 +19068,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7471",
-   "self_type" : "type-7470",
+   "referenced_type" : "type-7592",
+   "self_type" : "type-7591",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19080,8 +19077,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-7583",
-   "self_type" : "type-7582",
+   "referenced_type" : "type-7626",
+   "self_type" : "type-7625",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19107,8 +19104,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1544",
+   "self_type" : "type-1596",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19116,8 +19113,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1649",
+   "referenced_type" : "type-1596",
+   "self_type" : "type-2378",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19125,8 +19122,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1658",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-2387",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19134,8 +19131,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
    "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1505",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19143,8 +19140,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-1655",
-   "self_type" : "type-1654",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2383",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19152,8 +19149,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, unsigned int)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, unsigned int)",
-   "referenced_type" : "type-1651",
-   "self_type" : "type-1650",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2379",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19161,8 +19158,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, unsigned int, unsigned char *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, unsigned int, unsigned char *)",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2376",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19170,8 +19167,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE **, unsigned int, void *, void *)",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1659",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2388",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19179,8 +19176,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-1657",
-   "self_type" : "type-1656",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2385",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19188,8 +19185,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "referenced_type" : "type-1635",
-   "self_type" : "type-1634",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2363",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19197,8 +19194,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-1637",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19206,8 +19203,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19215,8 +19212,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "referenced_type" : "type-1639",
-   "self_type" : "type-1638",
+   "referenced_type" : "type-2368",
+   "self_type" : "type-2367",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19224,8 +19221,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_VERSIONTYPE *, OMX_VERSIONTYPE *, unsigned char (*)[128])",
    "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_VERSIONTYPE *, OMX_VERSIONTYPE *, unsigned char (*)[128])",
-   "referenced_type" : "type-1631",
-   "self_type" : "type-1630",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2359",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19233,8 +19230,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "referenced_type" : "type-1662",
-   "self_type" : "type-1661",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19242,8 +19239,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-1653",
-   "self_type" : "type-1652",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2381",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19251,8 +19248,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, void *, unsigned int, OMX_TUNNELSETUPTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, void *, unsigned int, OMX_TUNNELSETUPTYPE *)",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1644",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2373",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19260,8 +19257,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1594",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19269,8 +19266,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_EVENTTYPE, unsigned int, unsigned int, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_EVENTTYPE, unsigned int, unsigned int, void *)",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1593",
+   "self_type" : "type-1592",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -19278,8 +19275,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_INDEXTYPE *",
    "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-1361",
-   "self_type" : "type-1640",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-2369",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19287,8 +19284,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_STATETYPE *",
    "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-1364",
-   "self_type" : "type-1643",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-2372",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19296,8 +19293,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
    "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-2375",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19305,8 +19302,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1480",
+   "self_type" : "type-2361",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -19341,8 +19338,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1403",
+   "self_type" : "type-1402",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19350,8 +19347,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1418",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19359,8 +19356,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2460",
-   "self_type" : "type-2459",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1435",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19368,8 +19365,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2555",
-   "self_type" : "type-2554",
+   "referenced_type" : "type-1438",
+   "self_type" : "type-1437",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19377,8 +19374,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2620",
-   "self_type" : "type-2619",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1500",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19386,8 +19383,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2788",
-   "self_type" : "type-2787",
+   "referenced_type" : "type-1631",
+   "self_type" : "type-1630",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19395,8 +19392,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2862",
-   "self_type" : "type-2861",
+   "referenced_type" : "type-2611",
+   "self_type" : "type-2610",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19404,8 +19401,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2878",
-   "self_type" : "type-2877",
+   "referenced_type" : "type-3477",
+   "self_type" : "type-3476",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19413,8 +19410,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2898",
-   "self_type" : "type-2897",
+   "referenced_type" : "type-3560",
+   "self_type" : "type-3559",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19422,8 +19419,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2900",
-   "self_type" : "type-2899",
+   "referenced_type" : "type-3655",
+   "self_type" : "type-3654",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19431,8 +19428,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2954",
-   "self_type" : "type-2953",
+   "referenced_type" : "type-3720",
+   "self_type" : "type-3719",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19440,8 +19437,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3066",
-   "self_type" : "type-3065",
+   "referenced_type" : "type-3888",
+   "self_type" : "type-3887",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19449,8 +19446,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3642",
-   "self_type" : "type-3641",
+   "referenced_type" : "type-3931",
+   "self_type" : "type-3930",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19458,8 +19455,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3855",
-   "self_type" : "type-3854",
+   "referenced_type" : "type-3947",
+   "self_type" : "type-3946",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19467,8 +19464,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3866",
-   "self_type" : "type-3865",
+   "referenced_type" : "type-3967",
+   "self_type" : "type-3966",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19476,8 +19473,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3892",
-   "self_type" : "type-3891",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19485,8 +19482,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3919",
-   "self_type" : "type-3918",
+   "referenced_type" : "type-4019",
+   "self_type" : "type-4018",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19494,8 +19491,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4086",
-   "self_type" : "type-4085",
+   "referenced_type" : "type-4097",
+   "self_type" : "type-4096",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19503,8 +19500,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4194",
-   "self_type" : "type-4193",
+   "referenced_type" : "type-4300",
+   "self_type" : "type-4299",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19512,8 +19509,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4303",
-   "self_type" : "type-4302",
+   "referenced_type" : "type-4515",
+   "self_type" : "type-4514",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19521,8 +19518,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4786",
-   "self_type" : "type-4785",
+   "referenced_type" : "type-4526",
+   "self_type" : "type-4525",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19530,8 +19527,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4877",
-   "self_type" : "type-4876",
+   "referenced_type" : "type-4552",
+   "self_type" : "type-4551",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19539,8 +19536,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-4913",
-   "self_type" : "type-4912",
+   "referenced_type" : "type-4579",
+   "self_type" : "type-4578",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19548,8 +19545,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5024",
-   "self_type" : "type-5023",
+   "referenced_type" : "type-4746",
+   "self_type" : "type-4745",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19557,8 +19554,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5085",
-   "self_type" : "type-5084",
+   "referenced_type" : "type-4856",
+   "self_type" : "type-4855",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19566,8 +19563,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5197",
-   "self_type" : "type-5196",
+   "referenced_type" : "type-4967",
+   "self_type" : "type-4966",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19575,8 +19572,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5450",
-   "self_type" : "type-5449",
+   "referenced_type" : "type-5088",
+   "self_type" : "type-5087",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19584,8 +19581,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5533",
-   "self_type" : "type-5532",
+   "referenced_type" : "type-5129",
+   "self_type" : "type-5128",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19593,8 +19590,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5628",
-   "self_type" : "type-5627",
+   "referenced_type" : "type-5230",
+   "self_type" : "type-5229",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19602,8 +19599,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5693",
-   "self_type" : "type-5692",
+   "referenced_type" : "type-5552",
+   "self_type" : "type-5551",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19611,8 +19608,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5861",
-   "self_type" : "type-5860",
+   "referenced_type" : "type-5635",
+   "self_type" : "type-5634",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19620,8 +19617,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5904",
-   "self_type" : "type-5903",
+   "referenced_type" : "type-5730",
+   "self_type" : "type-5729",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19629,8 +19626,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5920",
-   "self_type" : "type-5919",
+   "referenced_type" : "type-5795",
+   "self_type" : "type-5794",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19638,8 +19635,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5940",
-   "self_type" : "type-5939",
+   "referenced_type" : "type-5963",
+   "self_type" : "type-5962",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19647,8 +19644,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5942",
-   "self_type" : "type-5941",
+   "referenced_type" : "type-6028",
+   "self_type" : "type-6027",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19656,8 +19653,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-5992",
-   "self_type" : "type-5991",
+   "referenced_type" : "type-6151",
+   "self_type" : "type-6150",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19665,8 +19662,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6070",
-   "self_type" : "type-6069",
+   "referenced_type" : "type-6221",
+   "self_type" : "type-6220",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19674,8 +19671,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6239",
-   "self_type" : "type-6238",
+   "referenced_type" : "type-6303",
+   "self_type" : "type-6302",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19683,8 +19680,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6353",
-   "self_type" : "type-6352",
+   "referenced_type" : "type-6349",
+   "self_type" : "type-6348",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19692,8 +19689,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6428",
-   "self_type" : "type-6427",
+   "referenced_type" : "type-6482",
+   "self_type" : "type-6481",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19701,8 +19698,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6509",
-   "self_type" : "type-6508",
+   "referenced_type" : "type-6524",
+   "self_type" : "type-6523",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19710,8 +19707,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6567",
-   "self_type" : "type-6566",
+   "referenced_type" : "type-6540",
+   "self_type" : "type-6539",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19719,8 +19716,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6717",
-   "self_type" : "type-6716",
+   "referenced_type" : "type-6558",
+   "self_type" : "type-6557",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19728,8 +19725,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6745",
-   "self_type" : "type-6744",
+   "referenced_type" : "type-6560",
+   "self_type" : "type-6559",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19737,8 +19734,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6762",
-   "self_type" : "type-6761",
+   "referenced_type" : "type-6607",
+   "self_type" : "type-6606",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19746,8 +19743,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6777",
-   "self_type" : "type-6776",
+   "referenced_type" : "type-6684",
+   "self_type" : "type-6683",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19755,8 +19752,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6780",
-   "self_type" : "type-6779",
+   "referenced_type" : "type-6904",
+   "self_type" : "type-6903",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19764,8 +19761,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6832",
-   "self_type" : "type-6831",
+   "referenced_type" : "type-7120",
+   "self_type" : "type-7119",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19773,8 +19770,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-6892",
-   "self_type" : "type-6891",
+   "referenced_type" : "type-7135",
+   "self_type" : "type-7134",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19782,8 +19779,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7042",
-   "self_type" : "type-7041",
+   "referenced_type" : "type-7171",
+   "self_type" : "type-7170",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19791,8 +19788,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7252",
-   "self_type" : "type-7251",
+   "referenced_type" : "type-7214",
+   "self_type" : "type-7213",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19800,8 +19797,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7263",
-   "self_type" : "type-7262",
+   "referenced_type" : "type-7361",
+   "self_type" : "type-7360",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19809,8 +19806,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7284",
-   "self_type" : "type-7283",
+   "referenced_type" : "type-7451",
+   "self_type" : "type-7450",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19818,8 +19815,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7295",
-   "self_type" : "type-7294",
+   "referenced_type" : "type-7456",
+   "self_type" : "type-7455",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19827,8 +19824,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7322",
-   "self_type" : "type-7321",
+   "referenced_type" : "type-7493",
+   "self_type" : "type-7492",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19836,8 +19833,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7468",
-   "self_type" : "type-7467",
+   "referenced_type" : "type-7590",
+   "self_type" : "type-7589",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19845,8 +19842,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-7581",
-   "self_type" : "type-7580",
+   "referenced_type" : "type-7624",
+   "self_type" : "type-7623",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19899,15 +19896,6 @@
    "alignment" : 8,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-2666",
-   "self_type" : "type-2665",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ALooper::LooperThread *",
-   "name" : "android::ALooper::LooperThread *",
    "referenced_type" : "type-276",
    "self_type" : "type-275",
    "size" : 8,
@@ -19917,8 +19905,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-5739",
-   "self_type" : "type-5738",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3765",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19926,8 +19914,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-6196",
-   "self_type" : "type-6195",
+   "referenced_type" : "type-5841",
+   "self_type" : "type-5840",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-5984",
+   "self_type" : "type-5983",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19999,7 +19996,7 @@
    "linker_set_key" : "android::BnInterface<android::IProducerListener> *",
    "name" : "android::BnInterface<android::IProducerListener> *",
    "referenced_type" : "type-82",
-   "self_type" : "type-3843",
+   "self_type" : "type-4503",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20016,8 +20013,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-3026",
-   "self_type" : "type-3025",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1579",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20025,8 +20022,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-6033",
-   "self_type" : "type-6032",
+   "referenced_type" : "type-4060",
+   "self_type" : "type-4059",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20034,8 +20031,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpConsumerListener *",
    "name" : "android::BpConsumerListener *",
-   "referenced_type" : "type-6854",
-   "self_type" : "type-6853",
+   "referenced_type" : "type-6648",
+   "self_type" : "type-6647",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20043,8 +20040,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-3044",
-   "self_type" : "type-3043",
+   "referenced_type" : "type-1603",
+   "self_type" : "type-1602",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20052,8 +20049,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-6051",
-   "self_type" : "type-6050",
+   "referenced_type" : "type-4078",
+   "self_type" : "type-4077",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20061,8 +20058,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferConsumer *",
    "name" : "android::BpGraphicBufferConsumer *",
-   "referenced_type" : "type-6869",
-   "self_type" : "type-6868",
+   "referenced_type" : "type-6663",
+   "self_type" : "type-6662",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20070,8 +20067,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-3575",
-   "self_type" : "type-3574",
+   "referenced_type" : "type-4233",
+   "self_type" : "type-4232",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20079,8 +20076,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpGraphicBufferProducer *",
    "name" : "android::BpGraphicBufferProducer *",
-   "referenced_type" : "type-6977",
-   "self_type" : "type-6976",
+   "referenced_type" : "type-6848",
+   "self_type" : "type-6847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20088,8 +20085,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpInterface<android::IConsumerListener> *",
    "name" : "android::BpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-2949",
-   "self_type" : "type-2952",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1499",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20097,8 +20094,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-3061",
-   "self_type" : "type-3064",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1628",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20106,8 +20103,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer> *",
    "name" : "android::BpInterface<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-3662",
-   "self_type" : "type-3665",
+   "referenced_type" : "type-4320",
+   "self_type" : "type-4323",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20115,8 +20112,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpInterface<android::IProducerListener> *",
    "name" : "android::BpInterface<android::IProducerListener> *",
-   "referenced_type" : "type-3822",
-   "self_type" : "type-3825",
+   "referenced_type" : "type-4482",
+   "self_type" : "type-4485",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -20124,8 +20121,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-3796",
-   "self_type" : "type-3795",
+   "referenced_type" : "type-4455",
+   "self_type" : "type-4454",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20133,8 +20130,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpProducerListener *",
    "name" : "android::BpProducerListener *",
-   "referenced_type" : "type-7207",
-   "self_type" : "type-7206",
+   "referenced_type" : "type-7062",
+   "self_type" : "type-7061",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20160,8 +20157,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-2538",
-   "self_type" : "type-2537",
+   "referenced_type" : "type-1530",
+   "self_type" : "type-1529",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1669",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-3638",
+   "self_type" : "type-3637",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20169,8 +20184,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-2582",
-   "self_type" : "type-2581",
+   "referenced_type" : "type-3682",
+   "self_type" : "type-3681",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20178,8 +20193,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-2978",
-   "self_type" : "type-2977",
+   "referenced_type" : "type-4041",
+   "self_type" : "type-4040",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20187,8 +20202,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-3100",
-   "self_type" : "type-3099",
+   "referenced_type" : "type-4127",
+   "self_type" : "type-4126",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20196,8 +20211,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5611",
-   "self_type" : "type-5610",
+   "referenced_type" : "type-5713",
+   "self_type" : "type-5712",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20205,8 +20220,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-5655",
-   "self_type" : "type-5654",
+   "referenced_type" : "type-5757",
+   "self_type" : "type-5756",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20214,26 +20229,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6014",
-   "self_type" : "type-6013",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::BufferItem *",
-   "name" : "android::BufferItem *",
-   "referenced_type" : "type-6100",
-   "self_type" : "type-6099",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::BufferItem *",
-   "name" : "android::BufferItem *",
-   "referenced_type" : "type-6490",
-   "self_type" : "type-6489",
+   "referenced_type" : "type-6284",
+   "self_type" : "type-6283",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -20241,8 +20238,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6531",
-   "self_type" : "type-6530",
+   "referenced_type" : "type-6322",
+   "self_type" : "type-6321",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20250,8 +20247,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6842",
-   "self_type" : "type-6841",
+   "referenced_type" : "type-6631",
+   "self_type" : "type-6630",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20259,8 +20256,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-6909",
-   "self_type" : "type-6908",
+   "referenced_type" : "type-6713",
+   "self_type" : "type-6712",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -20277,8 +20274,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1816",
+   "referenced_type" : "type-2538",
+   "self_type" : "type-2537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20286,8 +20283,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-4287",
-   "self_type" : "type-4286",
+   "referenced_type" : "type-4951",
+   "self_type" : "type-4950",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20295,8 +20292,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-6233",
-   "self_type" : "type-6232",
+   "referenced_type" : "type-6022",
+   "self_type" : "type-6021",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20304,8 +20301,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-7117",
-   "self_type" : "type-7116",
+   "referenced_type" : "type-7235",
+   "self_type" : "type-7234",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20313,8 +20310,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-2392",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-3492",
+   "self_type" : "type-3491",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20322,8 +20319,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-5465",
-   "self_type" : "type-5464",
+   "referenced_type" : "type-5567",
+   "self_type" : "type-5566",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20331,8 +20328,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueConsumer *",
    "name" : "android::BufferQueueConsumer *",
-   "referenced_type" : "type-6365",
-   "self_type" : "type-6364",
+   "referenced_type" : "type-6164",
+   "self_type" : "type-6163",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20358,8 +20355,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2418",
+   "referenced_type" : "type-3519",
+   "self_type" : "type-3518",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20367,8 +20364,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-2517",
-   "self_type" : "type-2516",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3616",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20376,8 +20373,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-2674",
-   "self_type" : "type-2673",
+   "referenced_type" : "type-3774",
+   "self_type" : "type-3773",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20385,8 +20382,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5492",
-   "self_type" : "type-5491",
+   "referenced_type" : "type-5594",
+   "self_type" : "type-5593",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20394,8 +20391,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5590",
-   "self_type" : "type-5589",
+   "referenced_type" : "type-5692",
+   "self_type" : "type-5691",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20403,8 +20400,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-5747",
-   "self_type" : "type-5746",
+   "referenced_type" : "type-5849",
+   "self_type" : "type-5848",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20412,8 +20409,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6385",
-   "self_type" : "type-6384",
+   "referenced_type" : "type-6183",
+   "self_type" : "type-6182",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20421,8 +20418,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6477",
-   "self_type" : "type-6476",
+   "referenced_type" : "type-6269",
+   "self_type" : "type-6268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20430,8 +20427,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueCore *",
    "name" : "android::BufferQueueCore *",
-   "referenced_type" : "type-6625",
-   "self_type" : "type-6624",
+   "referenced_type" : "type-6401",
+   "self_type" : "type-6400",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20457,8 +20454,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-2404",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3503",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20466,8 +20463,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-5477",
-   "self_type" : "type-5476",
+   "referenced_type" : "type-5579",
+   "self_type" : "type-5578",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20475,8 +20472,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueueProducer *",
    "name" : "android::BufferQueueProducer *",
-   "referenced_type" : "type-6374",
-   "self_type" : "type-6373",
+   "referenced_type" : "type-6173",
+   "self_type" : "type-6172",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20511,8 +20508,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-2602",
-   "self_type" : "type-2601",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3701",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20520,8 +20517,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-5675",
-   "self_type" : "type-5674",
+   "referenced_type" : "type-5777",
+   "self_type" : "type-5776",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20529,8 +20526,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ComposerService *",
    "name" : "android::ComposerService *",
-   "referenced_type" : "type-6547",
-   "self_type" : "type-6546",
+   "referenced_type" : "type-6335",
+   "self_type" : "type-6334",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -20556,8 +20553,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-2713",
-   "self_type" : "type-2712",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20565,8 +20562,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-2920",
-   "self_type" : "type-2919",
+   "referenced_type" : "type-3813",
+   "self_type" : "type-3812",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20574,8 +20571,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-5786",
-   "self_type" : "type-5785",
+   "referenced_type" : "type-3988",
+   "self_type" : "type-3987",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20583,8 +20580,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-5961",
-   "self_type" : "type-5960",
+   "referenced_type" : "type-5888",
+   "self_type" : "type-5887",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20592,8 +20589,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-6655",
-   "self_type" : "type-6654",
+   "referenced_type" : "type-6424",
+   "self_type" : "type-6423",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20601,8 +20598,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
    "name" : "android::ConsumerBase::FrameAvailableListener *",
-   "referenced_type" : "type-6802",
-   "self_type" : "type-6801",
+   "referenced_type" : "type-6576",
+   "self_type" : "type-6575",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20610,8 +20607,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-3292",
+   "self_type" : "type-3291",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20619,8 +20616,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-3481",
+   "self_type" : "type-3480",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20637,8 +20634,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5265",
-   "self_type" : "type-5264",
+   "referenced_type" : "type-5367",
+   "self_type" : "type-5366",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20646,8 +20643,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-5454",
-   "self_type" : "type-5453",
+   "referenced_type" : "type-5556",
+   "self_type" : "type-5555",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20655,8 +20652,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-6274",
-   "self_type" : "type-6273",
+   "referenced_type" : "type-6066",
+   "self_type" : "type-6065",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20664,8 +20661,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ConsumerListener *",
    "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-6357",
-   "self_type" : "type-6356",
+   "referenced_type" : "type-6156",
+   "self_type" : "type-6155",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20709,8 +20706,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1414",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20718,8 +20715,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2346",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1433",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20727,8 +20724,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-2386",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1456",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20736,8 +20733,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-2560",
-   "self_type" : "type-2559",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20745,8 +20742,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-2562",
-   "self_type" : "type-2561",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20754,8 +20751,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-2738",
-   "self_type" : "type-2737",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20763,8 +20760,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-2874",
-   "self_type" : "type-2873",
+   "referenced_type" : "type-3447",
+   "self_type" : "type-3446",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20772,8 +20769,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-2896",
-   "self_type" : "type-2895",
+   "referenced_type" : "type-3486",
+   "self_type" : "type-3485",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20781,8 +20778,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-2922",
-   "self_type" : "type-2921",
+   "referenced_type" : "type-3660",
+   "self_type" : "type-3659",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20790,8 +20787,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3032",
-   "self_type" : "type-3031",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3661",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20799,8 +20796,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3051",
-   "self_type" : "type-3050",
+   "referenced_type" : "type-3838",
+   "self_type" : "type-3837",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20808,8 +20805,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3739",
-   "self_type" : "type-3738",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20817,8 +20814,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-3996",
-   "self_type" : "type-3995",
+   "referenced_type" : "type-3965",
+   "self_type" : "type-3964",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20826,8 +20823,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4012",
-   "self_type" : "type-4011",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20835,8 +20832,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4273",
-   "self_type" : "type-4272",
+   "referenced_type" : "type-4066",
+   "self_type" : "type-4065",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20844,8 +20841,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4804",
-   "self_type" : "type-4803",
+   "referenced_type" : "type-4085",
+   "self_type" : "type-4084",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20853,8 +20850,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-4946",
-   "self_type" : "type-4945",
+   "referenced_type" : "type-4398",
+   "self_type" : "type-4397",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20862,8 +20859,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5108",
-   "self_type" : "type-5107",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4655",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20871,8 +20868,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5420",
-   "self_type" : "type-5419",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4671",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20880,8 +20877,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5459",
-   "self_type" : "type-5458",
+   "referenced_type" : "type-4935",
+   "self_type" : "type-4934",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20889,8 +20886,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5633",
-   "self_type" : "type-5632",
+   "referenced_type" : "type-5146",
+   "self_type" : "type-5145",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20898,8 +20895,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5635",
-   "self_type" : "type-5634",
+   "referenced_type" : "type-5522",
+   "self_type" : "type-5521",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20907,8 +20904,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5811",
-   "self_type" : "type-5810",
+   "referenced_type" : "type-5561",
+   "self_type" : "type-5560",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20916,8 +20913,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5916",
-   "self_type" : "type-5915",
+   "referenced_type" : "type-5735",
+   "self_type" : "type-5734",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20925,8 +20922,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5938",
-   "self_type" : "type-5937",
+   "referenced_type" : "type-5737",
+   "self_type" : "type-5736",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20934,8 +20931,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-5963",
-   "self_type" : "type-5962",
+   "referenced_type" : "type-5913",
+   "self_type" : "type-5912",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20943,8 +20940,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6039",
-   "self_type" : "type-6038",
+   "referenced_type" : "type-6013",
+   "self_type" : "type-6012",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20952,8 +20949,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6058",
-   "self_type" : "type-6057",
+   "referenced_type" : "type-6126",
+   "self_type" : "type-6125",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20961,8 +20958,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6224",
-   "self_type" : "type-6223",
+   "referenced_type" : "type-6158",
+   "self_type" : "type-6157",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20970,8 +20967,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6330",
-   "self_type" : "type-6329",
+   "referenced_type" : "type-6307",
+   "self_type" : "type-6306",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20979,8 +20976,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6359",
-   "self_type" : "type-6358",
+   "referenced_type" : "type-6309",
+   "self_type" : "type-6308",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20988,8 +20985,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6513",
-   "self_type" : "type-6512",
+   "referenced_type" : "type-6437",
+   "self_type" : "type-6436",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20997,8 +20994,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6516",
-   "self_type" : "type-6515",
+   "referenced_type" : "type-6536",
+   "self_type" : "type-6535",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21006,8 +21003,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6673",
-   "self_type" : "type-6672",
+   "referenced_type" : "type-6556",
+   "self_type" : "type-6555",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21015,8 +21012,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6757",
-   "self_type" : "type-6756",
+   "referenced_type" : "type-6578",
+   "self_type" : "type-6577",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21024,8 +21021,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6775",
-   "self_type" : "type-6774",
+   "referenced_type" : "type-6653",
+   "self_type" : "type-6652",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21033,8 +21030,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6804",
-   "self_type" : "type-6803",
+   "referenced_type" : "type-6670",
+   "self_type" : "type-6669",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21042,8 +21039,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6859",
-   "self_type" : "type-6858",
+   "referenced_type" : "type-6998",
+   "self_type" : "type-6997",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21051,26 +21048,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-6877",
-   "self_type" : "type-6876",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-7034",
-   "self_type" : "type-7033",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-7145",
-   "self_type" : "type-7144",
+   "referenced_type" : "type-7188",
+   "self_type" : "type-7187",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21087,8 +21066,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7404",
-   "self_type" : "type-7403",
+   "referenced_type" : "type-7300",
+   "self_type" : "type-7299",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21096,8 +21075,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7418",
-   "self_type" : "type-7417",
+   "referenced_type" : "type-7313",
+   "self_type" : "type-7312",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7515",
+   "self_type" : "type-7514",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7661",
+   "self_type" : "type-7660",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21124,7 +21121,7 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem> *",
    "name" : "android::Flattenable<android::BufferItem> *",
    "referenced_type" : "type-22",
-   "self_type" : "type-2960",
+   "self_type" : "type-1511",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21133,7 +21130,7 @@
    "linker_set_key" : "android::Flattenable<android::Fence> *",
    "name" : "android::Flattenable<android::Fence> *",
    "referenced_type" : "type-17",
-   "self_type" : "type-3071",
+   "self_type" : "type-1637",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21142,7 +21139,7 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta> *",
    "referenced_type" : "type-26",
-   "self_type" : "type-3653",
+   "self_type" : "type-4311",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21151,7 +21148,7 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer> *",
    "name" : "android::Flattenable<android::GraphicBuffer> *",
    "referenced_type" : "type-15",
-   "self_type" : "type-3074",
+   "self_type" : "type-1641",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21160,7 +21157,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "referenced_type" : "type-33",
-   "self_type" : "type-3656",
+   "self_type" : "type-4314",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21169,7 +21166,7 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "referenced_type" : "type-35",
-   "self_type" : "type-3659",
+   "self_type" : "type-4317",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -21195,8 +21192,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-2679",
-   "self_type" : "type-2678",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1468",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21204,8 +21201,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-2931",
-   "self_type" : "type-2930",
+   "referenced_type" : "type-3779",
+   "self_type" : "type-3778",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21213,8 +21210,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-5752",
-   "self_type" : "type-5751",
+   "referenced_type" : "type-3999",
+   "self_type" : "type-3998",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21222,8 +21219,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-5972",
-   "self_type" : "type-5971",
+   "referenced_type" : "type-5854",
+   "self_type" : "type-5853",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21231,8 +21228,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-6629",
-   "self_type" : "type-6628",
+   "referenced_type" : "type-6405",
+   "self_type" : "type-6404",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21240,8 +21237,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GLConsumer::EglImage *",
    "name" : "android::GLConsumer::EglImage *",
-   "referenced_type" : "type-6815",
-   "self_type" : "type-6814",
+   "referenced_type" : "type-6587",
+   "self_type" : "type-6586",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21267,8 +21264,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-1417",
+   "self_type" : "type-1416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21276,8 +21273,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21285,8 +21282,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2499",
-   "self_type" : "type-2498",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21294,8 +21291,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2564",
-   "self_type" : "type-2563",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1608",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21303,8 +21300,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2784",
-   "self_type" : "type-2783",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21312,8 +21309,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2876",
-   "self_type" : "type-2875",
+   "referenced_type" : "type-3488",
+   "self_type" : "type-3487",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21321,8 +21318,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-2924",
-   "self_type" : "type-2923",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3598",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21330,8 +21327,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3034",
-   "self_type" : "type-3033",
+   "referenced_type" : "type-3664",
+   "self_type" : "type-3663",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21339,8 +21336,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3049",
-   "self_type" : "type-3048",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21348,8 +21345,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3791",
-   "self_type" : "type-3790",
+   "referenced_type" : "type-3945",
+   "self_type" : "type-3944",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21357,8 +21354,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-3890",
-   "self_type" : "type-3889",
+   "referenced_type" : "type-3992",
+   "self_type" : "type-3991",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21366,8 +21363,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4019",
-   "self_type" : "type-4018",
+   "referenced_type" : "type-4068",
+   "self_type" : "type-4067",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21375,8 +21372,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4806",
-   "self_type" : "type-4805",
+   "referenced_type" : "type-4083",
+   "self_type" : "type-4082",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21384,8 +21381,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-4949",
-   "self_type" : "type-4948",
+   "referenced_type" : "type-4450",
+   "self_type" : "type-4449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21393,8 +21390,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5110",
-   "self_type" : "type-5109",
+   "referenced_type" : "type-4550",
+   "self_type" : "type-4549",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21402,8 +21399,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5425",
-   "self_type" : "type-5424",
+   "referenced_type" : "type-4679",
+   "self_type" : "type-4678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21411,8 +21408,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5461",
-   "self_type" : "type-5460",
+   "referenced_type" : "type-5148",
+   "self_type" : "type-5147",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21420,8 +21417,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5572",
-   "self_type" : "type-5571",
+   "referenced_type" : "type-5527",
+   "self_type" : "type-5526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21429,8 +21426,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5637",
-   "self_type" : "type-5636",
+   "referenced_type" : "type-5563",
+   "self_type" : "type-5562",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21438,8 +21435,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5857",
-   "self_type" : "type-5856",
+   "referenced_type" : "type-5674",
+   "self_type" : "type-5673",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21447,8 +21444,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5918",
-   "self_type" : "type-5917",
+   "referenced_type" : "type-5739",
+   "self_type" : "type-5738",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21456,8 +21453,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-5965",
-   "self_type" : "type-5964",
+   "referenced_type" : "type-5959",
+   "self_type" : "type-5958",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21465,8 +21462,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6041",
-   "self_type" : "type-6040",
+   "referenced_type" : "type-5986",
+   "self_type" : "type-5985",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21474,8 +21471,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6056",
-   "self_type" : "type-6055",
+   "referenced_type" : "type-6131",
+   "self_type" : "type-6130",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21483,8 +21480,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6198",
-   "self_type" : "type-6197",
+   "referenced_type" : "type-6160",
+   "self_type" : "type-6159",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21492,8 +21489,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6335",
-   "self_type" : "type-6334",
+   "referenced_type" : "type-6259",
+   "self_type" : "type-6258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21501,8 +21498,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6361",
-   "self_type" : "type-6360",
+   "referenced_type" : "type-6312",
+   "self_type" : "type-6311",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21510,8 +21507,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6406",
-   "self_type" : "type-6405",
+   "referenced_type" : "type-6478",
+   "self_type" : "type-6477",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21519,8 +21516,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6465",
-   "self_type" : "type-6464",
+   "referenced_type" : "type-6538",
+   "self_type" : "type-6537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21528,8 +21525,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6518",
-   "self_type" : "type-6517",
+   "referenced_type" : "type-6580",
+   "self_type" : "type-6579",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21537,8 +21534,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6713",
-   "self_type" : "type-6712",
+   "referenced_type" : "type-6629",
+   "self_type" : "type-6628",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21546,8 +21543,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6760",
-   "self_type" : "type-6759",
+   "referenced_type" : "type-6655",
+   "self_type" : "type-6654",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21555,8 +21552,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6806",
-   "self_type" : "type-6805",
+   "referenced_type" : "type-6668",
+   "self_type" : "type-6667",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21564,26 +21561,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6861",
-   "self_type" : "type-6860",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-6875",
-   "self_type" : "type-6874",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7202",
-   "self_type" : "type-7201",
+   "referenced_type" : "type-7056",
+   "self_type" : "type-7055",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21600,6 +21579,15 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7320",
+   "self_type" : "type-7319",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
    "referenced_type" : "type-735",
    "self_type" : "type-734",
    "size" : 8,
@@ -21609,8 +21597,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-7425",
-   "self_type" : "type-7424",
+   "referenced_type" : "type-7517",
+   "self_type" : "type-7516",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7664",
+   "self_type" : "type-7663",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -21654,8 +21651,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2153",
-   "self_type" : "type-2152",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1412",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21663,8 +21660,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2365",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1448",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21672,8 +21669,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21681,44 +21678,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2543",
-   "self_type" : "type-2542",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2600",
-   "self_type" : "type-2599",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2724",
-   "self_type" : "type-2723",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2872",
-   "self_type" : "type-2871",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-2913",
-   "self_type" : "type-2912",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3252",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21735,8 +21696,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3554",
-   "self_type" : "type-3553",
+   "referenced_type" : "type-3465",
+   "self_type" : "type-3464",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21744,8 +21705,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3732",
-   "self_type" : "type-3731",
+   "referenced_type" : "type-3532",
+   "self_type" : "type-3531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21753,8 +21714,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-3944",
-   "self_type" : "type-3943",
+   "referenced_type" : "type-3643",
+   "self_type" : "type-3642",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21762,8 +21723,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4108",
-   "self_type" : "type-4107",
+   "referenced_type" : "type-3700",
+   "self_type" : "type-3699",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21771,8 +21732,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-4892",
-   "self_type" : "type-4891",
+   "referenced_type" : "type-3824",
+   "self_type" : "type-3823",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21780,8 +21741,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5038",
-   "self_type" : "type-5037",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21789,8 +21750,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5127",
-   "self_type" : "type-5126",
+   "referenced_type" : "type-3982",
+   "self_type" : "type-3981",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21798,8 +21759,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5226",
-   "self_type" : "type-5225",
+   "referenced_type" : "type-4212",
+   "self_type" : "type-4211",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21807,8 +21768,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5438",
-   "self_type" : "type-5437",
+   "referenced_type" : "type-4391",
+   "self_type" : "type-4390",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21816,8 +21777,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5505",
-   "self_type" : "type-5504",
+   "referenced_type" : "type-4604",
+   "self_type" : "type-4603",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21825,8 +21786,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5616",
-   "self_type" : "type-5615",
+   "referenced_type" : "type-4770",
+   "self_type" : "type-4769",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21834,8 +21795,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5673",
-   "self_type" : "type-5672",
+   "referenced_type" : "type-5097",
+   "self_type" : "type-5096",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21843,8 +21804,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5797",
-   "self_type" : "type-5796",
+   "referenced_type" : "type-5165",
+   "self_type" : "type-5164",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21852,8 +21813,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5914",
-   "self_type" : "type-5913",
+   "referenced_type" : "type-5328",
+   "self_type" : "type-5327",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21861,8 +21822,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-5955",
-   "self_type" : "type-5954",
+   "referenced_type" : "type-5540",
+   "self_type" : "type-5539",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21870,8 +21831,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6185",
-   "self_type" : "type-6184",
+   "referenced_type" : "type-5607",
+   "self_type" : "type-5606",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21879,8 +21840,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6268",
-   "self_type" : "type-6267",
+   "referenced_type" : "type-5718",
+   "self_type" : "type-5717",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21888,8 +21849,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6345",
-   "self_type" : "type-6344",
+   "referenced_type" : "type-5775",
+   "self_type" : "type-5774",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21897,8 +21858,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6395",
-   "self_type" : "type-6394",
+   "referenced_type" : "type-5899",
+   "self_type" : "type-5898",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21906,8 +21867,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6496",
-   "self_type" : "type-6495",
+   "referenced_type" : "type-6060",
+   "self_type" : "type-6059",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21915,8 +21876,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6545",
-   "self_type" : "type-6544",
+   "referenced_type" : "type-6143",
+   "self_type" : "type-6142",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21924,8 +21885,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6661",
-   "self_type" : "type-6660",
+   "referenced_type" : "type-6195",
+   "self_type" : "type-6194",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21933,8 +21894,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6755",
-   "self_type" : "type-6754",
+   "referenced_type" : "type-6289",
+   "self_type" : "type-6288",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21942,8 +21903,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6794",
-   "self_type" : "type-6793",
+   "referenced_type" : "type-6333",
+   "self_type" : "type-6332",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21951,8 +21912,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-6957",
-   "self_type" : "type-6956",
+   "referenced_type" : "type-6428",
+   "self_type" : "type-6427",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21960,8 +21921,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7136",
-   "self_type" : "type-7135",
+   "referenced_type" : "type-6534",
+   "self_type" : "type-6533",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21969,8 +21930,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7349",
-   "self_type" : "type-7348",
+   "referenced_type" : "type-6571",
+   "self_type" : "type-6570",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21978,8 +21939,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-7491",
-   "self_type" : "type-7490",
+   "referenced_type" : "type-6818",
+   "self_type" : "type-6817",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6990",
+   "self_type" : "type-6989",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7242",
+   "self_type" : "type-7241",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7380",
+   "self_type" : "type-7379",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -21996,6 +21984,15 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7604",
+   "self_type" : "type-7603",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
    "referenced_type" : "type-843",
    "self_type" : "type-842",
    "size" : 8,
@@ -22032,8 +22029,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-2804",
-   "self_type" : "type-2803",
+   "referenced_type" : "type-3904",
+   "self_type" : "type-3903",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22050,8 +22047,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-5877",
-   "self_type" : "type-5876",
+   "referenced_type" : "type-5979",
+   "self_type" : "type-5978",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22059,8 +22056,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-6217",
-   "self_type" : "type-6216",
+   "referenced_type" : "type-6006",
+   "self_type" : "type-6005",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22077,8 +22074,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-3602",
-   "self_type" : "type-3601",
+   "referenced_type" : "type-4260",
+   "self_type" : "type-4259",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22086,8 +22083,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-3611",
-   "self_type" : "type-3610",
+   "referenced_type" : "type-4269",
+   "self_type" : "type-4268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22095,8 +22092,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4037",
-   "self_type" : "type-4036",
+   "referenced_type" : "type-4697",
+   "self_type" : "type-4696",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22104,8 +22101,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-4952",
-   "self_type" : "type-4951",
+   "referenced_type" : "type-6870",
+   "self_type" : "type-6869",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22113,8 +22110,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-7002",
-   "self_type" : "type-7001",
+   "referenced_type" : "type-6876",
+   "self_type" : "type-6875",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22122,8 +22119,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-7009",
-   "self_type" : "type-7008",
+   "referenced_type" : "type-7333",
+   "self_type" : "type-7332",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22131,8 +22128,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
    "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
-   "referenced_type" : "type-7438",
-   "self_type" : "type-7437",
+   "referenced_type" : "type-7667",
+   "self_type" : "type-7666",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22140,8 +22137,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-4170",
-   "self_type" : "type-4169",
+   "referenced_type" : "type-4832",
+   "self_type" : "type-4831",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22149,8 +22146,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-5058",
-   "self_type" : "type-5057",
+   "referenced_type" : "type-5113",
+   "self_type" : "type-5112",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22158,8 +22155,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
    "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
-   "referenced_type" : "type-7552",
-   "self_type" : "type-7551",
+   "referenced_type" : "type-7436",
+   "self_type" : "type-7435",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22167,8 +22164,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-3628",
-   "self_type" : "type-3627",
+   "referenced_type" : "type-4286",
+   "self_type" : "type-4285",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22176,8 +22173,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-4007",
-   "self_type" : "type-4006",
+   "referenced_type" : "type-4667",
+   "self_type" : "type-4666",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22185,8 +22182,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-7024",
-   "self_type" : "type-7023",
+   "referenced_type" : "type-6890",
+   "self_type" : "type-6889",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22194,8 +22191,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-7415",
-   "self_type" : "type-7414",
+   "referenced_type" : "type-7311",
+   "self_type" : "type-7310",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22203,8 +22200,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IProducerListener, android::BnProducerListener> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IProducerListener, android::BnProducerListener> *",
-   "referenced_type" : "type-4166",
-   "self_type" : "type-4165",
+   "referenced_type" : "type-4828",
+   "self_type" : "type-4827",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22212,8 +22209,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IProducerListener, android::BnProducerListener> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V1_0::IProducerListener, android::BnProducerListener> *",
-   "referenced_type" : "type-7548",
-   "self_type" : "type-7547",
+   "referenced_type" : "type-7432",
+   "self_type" : "type-7431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22221,8 +22218,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-3630",
-   "self_type" : "type-3629",
+   "referenced_type" : "type-4288",
+   "self_type" : "type-4287",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22230,8 +22227,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-4936",
-   "self_type" : "type-4935",
+   "referenced_type" : "type-6892",
+   "self_type" : "type-6891",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22239,8 +22236,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer, android::BnGraphicBufferProducer> *",
-   "referenced_type" : "type-7027",
-   "self_type" : "type-7026",
+   "referenced_type" : "type-7648",
+   "self_type" : "type-7647",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22248,8 +22245,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IProducerListener, android::BnProducerListener> *",
    "name" : "android::H2BConverter<android::hardware::graphics::bufferqueue::V2_0::IProducerListener, android::BnProducerListener> *",
-   "referenced_type" : "type-5053",
-   "self_type" : "type-5052",
+   "referenced_type" : "type-5109",
+   "self_type" : "type-5108",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -22257,8 +22254,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-3591",
-   "self_type" : "type-3590",
+   "referenced_type" : "type-4249",
+   "self_type" : "type-4248",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22266,8 +22263,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::HpGraphicBufferProducer *",
    "name" : "android::HpGraphicBufferProducer *",
-   "referenced_type" : "type-6990",
-   "self_type" : "type-6989",
+   "referenced_type" : "type-6859",
+   "self_type" : "type-6858",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22275,8 +22272,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-3864",
-   "self_type" : "type-3863",
+   "referenced_type" : "type-4524",
+   "self_type" : "type-4523",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22284,8 +22281,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::HpProducerListener *",
    "name" : "android::HpProducerListener *",
-   "referenced_type" : "type-7261",
-   "self_type" : "type-7260",
+   "referenced_type" : "type-7131",
+   "self_type" : "type-7130",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22329,8 +22326,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2399",
+   "referenced_type" : "type-1575",
+   "self_type" : "type-1574",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22338,8 +22335,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-2507",
-   "self_type" : "type-2506",
+   "referenced_type" : "type-1614",
+   "self_type" : "type-1613",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22347,8 +22344,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-2566",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-3500",
+   "self_type" : "type-3499",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22356,8 +22353,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-2659",
-   "self_type" : "type-2658",
+   "referenced_type" : "type-3607",
+   "self_type" : "type-3606",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22365,8 +22362,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3023",
-   "self_type" : "type-3022",
+   "referenced_type" : "type-3666",
+   "self_type" : "type-3665",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22374,8 +22371,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-3053",
-   "self_type" : "type-3052",
+   "referenced_type" : "type-3759",
+   "self_type" : "type-3758",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22383,8 +22380,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-4284",
-   "self_type" : "type-4283",
+   "referenced_type" : "type-4057",
+   "self_type" : "type-4056",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22392,8 +22389,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5112",
-   "self_type" : "type-5111",
+   "referenced_type" : "type-4087",
+   "self_type" : "type-4086",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22401,8 +22398,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5473",
-   "self_type" : "type-5472",
+   "referenced_type" : "type-4948",
+   "self_type" : "type-4947",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22410,8 +22407,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5580",
-   "self_type" : "type-5579",
+   "referenced_type" : "type-5151",
+   "self_type" : "type-5150",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22419,8 +22416,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5639",
-   "self_type" : "type-5638",
+   "referenced_type" : "type-5575",
+   "self_type" : "type-5574",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22428,8 +22425,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-5732",
-   "self_type" : "type-5731",
+   "referenced_type" : "type-5682",
+   "self_type" : "type-5681",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22437,8 +22434,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6030",
-   "self_type" : "type-6029",
+   "referenced_type" : "type-5741",
+   "self_type" : "type-5740",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22446,8 +22443,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6060",
-   "self_type" : "type-6059",
+   "referenced_type" : "type-5834",
+   "self_type" : "type-5833",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22455,8 +22452,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6231",
-   "self_type" : "type-6230",
+   "referenced_type" : "type-6020",
+   "self_type" : "type-6019",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22464,8 +22461,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6370",
-   "self_type" : "type-6369",
+   "referenced_type" : "type-6169",
+   "self_type" : "type-6168",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22473,8 +22470,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6472",
-   "self_type" : "type-6471",
+   "referenced_type" : "type-6264",
+   "self_type" : "type-6263",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22482,8 +22479,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6520",
-   "self_type" : "type-6519",
+   "referenced_type" : "type-6314",
+   "self_type" : "type-6313",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22491,8 +22488,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6608",
-   "self_type" : "type-6607",
+   "referenced_type" : "type-6389",
+   "self_type" : "type-6388",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22500,8 +22497,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6851",
-   "self_type" : "type-6850",
+   "referenced_type" : "type-6645",
+   "self_type" : "type-6644",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22509,8 +22506,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-6880",
-   "self_type" : "type-6879",
+   "referenced_type" : "type-6672",
+   "self_type" : "type-6671",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22518,8 +22515,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-7096",
-   "self_type" : "type-7095",
+   "referenced_type" : "type-7221",
+   "self_type" : "type-7220",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22563,8 +22560,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22572,8 +22569,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2676",
+   "referenced_type" : "type-1600",
+   "self_type" : "type-1599",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22581,8 +22578,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2902",
-   "self_type" : "type-2901",
+   "referenced_type" : "type-3490",
+   "self_type" : "type-3489",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22590,8 +22587,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2929",
-   "self_type" : "type-2928",
+   "referenced_type" : "type-3777",
+   "self_type" : "type-3776",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22599,8 +22596,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3041",
-   "self_type" : "type-3040",
+   "referenced_type" : "type-3971",
+   "self_type" : "type-3970",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22608,8 +22605,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5463",
-   "self_type" : "type-5462",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3996",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22617,8 +22614,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5750",
-   "self_type" : "type-5749",
+   "referenced_type" : "type-4075",
+   "self_type" : "type-4074",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5565",
+   "self_type" : "type-5564",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22635,8 +22641,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5944",
-   "self_type" : "type-5943",
+   "referenced_type" : "type-5852",
+   "self_type" : "type-5851",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22644,8 +22650,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5970",
-   "self_type" : "type-5969",
+   "referenced_type" : "type-6008",
+   "self_type" : "type-6007",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22653,8 +22659,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6048",
-   "self_type" : "type-6047",
+   "referenced_type" : "type-6044",
+   "self_type" : "type-6043",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22662,8 +22668,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6219",
-   "self_type" : "type-6218",
+   "referenced_type" : "type-6162",
+   "self_type" : "type-6161",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22671,8 +22677,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6363",
-   "self_type" : "type-6362",
+   "referenced_type" : "type-6403",
+   "self_type" : "type-6402",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22680,8 +22686,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6627",
-   "self_type" : "type-6626",
+   "referenced_type" : "type-6585",
+   "self_type" : "type-6584",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22689,17 +22695,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6812",
-   "self_type" : "type-6811",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6867",
-   "self_type" : "type-6866",
+   "referenced_type" : "type-6660",
+   "self_type" : "type-6659",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22716,8 +22713,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-3502",
+   "self_type" : "type-3501",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22725,8 +22722,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-2894",
-   "self_type" : "type-2893",
+   "referenced_type" : "type-3963",
+   "self_type" : "type-3962",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22734,8 +22731,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3570",
-   "self_type" : "type-3569",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4227",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22743,17 +22740,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-4808",
-   "self_type" : "type-4807",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5475",
-   "self_type" : "type-5474",
+   "referenced_type" : "type-5577",
+   "self_type" : "type-5576",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22770,8 +22758,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5936",
-   "self_type" : "type-5935",
+   "referenced_type" : "type-6003",
+   "self_type" : "type-6002",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22779,8 +22767,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6215",
-   "self_type" : "type-6214",
+   "referenced_type" : "type-6039",
+   "self_type" : "type-6038",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22788,8 +22776,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6372",
-   "self_type" : "type-6371",
+   "referenced_type" : "type-6171",
+   "self_type" : "type-6170",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22797,8 +22785,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6972",
-   "self_type" : "type-6971",
+   "referenced_type" : "type-6844",
+   "self_type" : "type-6843",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-7520",
+   "self_type" : "type-7519",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22833,8 +22830,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2719",
-   "self_type" : "type-2718",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1369",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22842,8 +22839,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2826",
-   "self_type" : "type-2825",
+   "referenced_type" : "type-3819",
+   "self_type" : "type-3818",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22851,8 +22848,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-5792",
-   "self_type" : "type-5791",
+   "referenced_type" : "type-3916",
+   "self_type" : "type-3915",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22860,8 +22857,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-5889",
-   "self_type" : "type-5888",
+   "referenced_type" : "type-5894",
+   "self_type" : "type-5893",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22869,8 +22866,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-6653",
-   "self_type" : "type-6652",
+   "referenced_type" : "type-6422",
+   "self_type" : "type-6421",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22878,8 +22875,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-6741",
-   "self_type" : "type-6740",
+   "referenced_type" : "type-6508",
+   "self_type" : "type-6507",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
   },
@@ -22905,8 +22902,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-3510",
+   "self_type" : "type-3509",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22914,8 +22911,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-3620",
+   "self_type" : "type-3619",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22923,8 +22920,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-2568",
-   "self_type" : "type-2567",
+   "referenced_type" : "type-3668",
+   "self_type" : "type-3667",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22932,8 +22929,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-3764",
+   "self_type" : "type-3763",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22941,8 +22938,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3596",
-   "self_type" : "type-3595",
+   "referenced_type" : "type-4254",
+   "self_type" : "type-4253",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22950,8 +22947,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3858",
-   "self_type" : "type-3857",
+   "referenced_type" : "type-4518",
+   "self_type" : "type-4517",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22959,8 +22956,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-3901",
-   "self_type" : "type-3900",
+   "referenced_type" : "type-4561",
+   "self_type" : "type-4560",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22968,8 +22965,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4031",
-   "self_type" : "type-4030",
+   "referenced_type" : "type-4691",
+   "self_type" : "type-4690",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22977,8 +22974,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4289",
-   "self_type" : "type-4288",
+   "referenced_type" : "type-4953",
+   "self_type" : "type-4952",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22986,8 +22983,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4795",
-   "self_type" : "type-4794",
+   "referenced_type" : "type-5153",
+   "self_type" : "type-5152",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -22995,8 +22992,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4800",
-   "self_type" : "type-4799",
+   "referenced_type" : "type-5585",
+   "self_type" : "type-5584",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23004,8 +23001,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4926",
-   "self_type" : "type-4925",
+   "referenced_type" : "type-5695",
+   "self_type" : "type-5694",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23013,8 +23010,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-4944",
-   "self_type" : "type-4943",
+   "referenced_type" : "type-5743",
+   "self_type" : "type-5742",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23022,8 +23019,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5114",
-   "self_type" : "type-5113",
+   "referenced_type" : "type-5839",
+   "self_type" : "type-5838",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23031,8 +23028,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5483",
-   "self_type" : "type-5482",
+   "referenced_type" : "type-6024",
+   "self_type" : "type-6023",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23040,8 +23037,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5593",
-   "self_type" : "type-5592",
+   "referenced_type" : "type-6178",
+   "self_type" : "type-6177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23049,8 +23046,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5641",
-   "self_type" : "type-5640",
+   "referenced_type" : "type-6272",
+   "self_type" : "type-6271",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23058,8 +23055,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-5737",
-   "self_type" : "type-5736",
+   "referenced_type" : "type-6316",
+   "self_type" : "type-6315",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23067,8 +23064,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6235",
-   "self_type" : "type-6234",
+   "referenced_type" : "type-6394",
+   "self_type" : "type-6393",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23076,8 +23073,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6379",
-   "self_type" : "type-6378",
+   "referenced_type" : "type-6864",
+   "self_type" : "type-6863",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23085,8 +23082,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6479",
-   "self_type" : "type-6478",
+   "referenced_type" : "type-7124",
+   "self_type" : "type-7123",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23094,8 +23091,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6522",
-   "self_type" : "type-6521",
+   "referenced_type" : "type-7184",
+   "self_type" : "type-7183",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23103,8 +23100,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6614",
-   "self_type" : "type-6613",
+   "referenced_type" : "type-7244",
+   "self_type" : "type-7243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23112,8 +23109,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-6995",
-   "self_type" : "type-6994",
+   "referenced_type" : "type-7328",
+   "self_type" : "type-7327",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23121,8 +23118,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7129",
-   "self_type" : "type-7128",
+   "referenced_type" : "type-7502",
+   "self_type" : "type-7501",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23130,8 +23127,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7255",
-   "self_type" : "type-7254",
+   "referenced_type" : "type-7509",
+   "self_type" : "type-7508",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23139,8 +23136,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7293",
-   "self_type" : "type-7292",
+   "referenced_type" : "type-7637",
+   "self_type" : "type-7636",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23148,8 +23145,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-7433",
-   "self_type" : "type-7432",
+   "referenced_type" : "type-7659",
+   "self_type" : "type-7658",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23193,8 +23190,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-2579",
-   "self_type" : "type-2578",
+   "referenced_type" : "type-3679",
+   "self_type" : "type-3678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23202,8 +23199,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-5652",
-   "self_type" : "type-5651",
+   "referenced_type" : "type-5754",
+   "self_type" : "type-5753",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23211,8 +23208,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ISurfaceComposer *",
    "name" : "android::ISurfaceComposer *",
-   "referenced_type" : "type-6529",
-   "self_type" : "type-6528",
+   "referenced_type" : "type-6320",
+   "self_type" : "type-6319",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23229,8 +23226,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-2574",
-   "self_type" : "type-2573",
+   "referenced_type" : "type-3674",
+   "self_type" : "type-3673",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23238,8 +23235,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-5647",
-   "self_type" : "type-5646",
+   "referenced_type" : "type-5749",
+   "self_type" : "type-5748",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23247,8 +23244,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ITransactionCompletedListener *",
    "name" : "android::ITransactionCompletedListener *",
-   "referenced_type" : "type-6527",
-   "self_type" : "type-6526",
+   "referenced_type" : "type-6318",
+   "self_type" : "type-6317",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23283,8 +23280,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1819",
+   "referenced_type" : "type-2541",
+   "self_type" : "type-2540",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23292,8 +23289,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-4292",
-   "self_type" : "type-4291",
+   "referenced_type" : "type-4956",
+   "self_type" : "type-4955",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23301,8 +23298,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-6237",
-   "self_type" : "type-6236",
+   "referenced_type" : "type-6026",
+   "self_type" : "type-6025",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23310,8 +23307,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-7138",
-   "self_type" : "type-7137",
+   "referenced_type" : "type-7270",
+   "self_type" : "type-7269",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -23320,7 +23317,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-48",
-   "self_type" : "type-3932",
+   "self_type" : "type-4592",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -23364,8 +23361,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-2589",
-   "self_type" : "type-2588",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23373,8 +23370,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-5662",
-   "self_type" : "type-5661",
+   "referenced_type" : "type-5764",
+   "self_type" : "type-5763",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23382,8 +23379,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-6263",
-   "self_type" : "type-6262",
+   "referenced_type" : "type-6055",
+   "self_type" : "type-6054",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -23499,8 +23496,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::OMXPluginBase *",
    "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-1667",
-   "self_type" : "type-1668",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2396",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
   },
@@ -23517,8 +23514,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
    "name" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
-   "referenced_type" : "type-2968",
-   "self_type" : "type-2970",
+   "referenced_type" : "type-1517",
+   "self_type" : "type-1519",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23526,8 +23523,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence> *",
    "name" : "android::Parcel::FlattenableHelper<android::Fence> *",
-   "referenced_type" : "type-3090",
-   "self_type" : "type-3092",
+   "referenced_type" : "type-1659",
+   "self_type" : "type-1661",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23535,8 +23532,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
    "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
-   "referenced_type" : "type-3673",
-   "self_type" : "type-3675",
+   "referenced_type" : "type-4331",
+   "self_type" : "type-4333",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23544,8 +23541,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
    "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
-   "referenced_type" : "type-3085",
-   "self_type" : "type-3087",
+   "referenced_type" : "type-1654",
+   "self_type" : "type-1656",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23553,8 +23550,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
    "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
-   "referenced_type" : "type-3678",
-   "self_type" : "type-3680",
+   "referenced_type" : "type-4336",
+   "self_type" : "type-4338",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23562,8 +23559,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
-   "referenced_type" : "type-3683",
-   "self_type" : "type-3685",
+   "referenced_type" : "type-4341",
+   "self_type" : "type-4343",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -23670,8 +23667,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1931",
-   "self_type" : "type-1930",
+   "referenced_type" : "type-1353",
+   "self_type" : "type-1352",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23679,8 +23676,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2359",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-1405",
+   "self_type" : "type-1404",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23688,8 +23685,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1420",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23697,8 +23694,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2529",
-   "self_type" : "type-2528",
+   "referenced_type" : "type-1442",
+   "self_type" : "type-1441",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23706,8 +23703,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2591",
-   "self_type" : "type-2590",
+   "referenced_type" : "type-1483",
+   "self_type" : "type-1482",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23715,8 +23712,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2683",
-   "self_type" : "type-2682",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1616",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23724,8 +23721,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2744",
-   "self_type" : "type-2743",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2650",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23733,8 +23730,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2808",
-   "self_type" : "type-2807",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23742,8 +23739,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2865",
-   "self_type" : "type-2864",
+   "referenced_type" : "type-3527",
+   "self_type" : "type-3526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23751,8 +23748,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2880",
-   "self_type" : "type-2879",
+   "referenced_type" : "type-3629",
+   "self_type" : "type-3628",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23760,8 +23757,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2906",
-   "self_type" : "type-2905",
+   "referenced_type" : "type-3691",
+   "self_type" : "type-3690",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23769,8 +23766,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2940",
-   "self_type" : "type-2939",
+   "referenced_type" : "type-3783",
+   "self_type" : "type-3782",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23778,8 +23775,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3055",
-   "self_type" : "type-3054",
+   "referenced_type" : "type-3844",
+   "self_type" : "type-3843",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23787,8 +23784,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3632",
-   "self_type" : "type-3631",
+   "referenced_type" : "type-3908",
+   "self_type" : "type-3907",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23796,8 +23793,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3817",
-   "self_type" : "type-3816",
+   "referenced_type" : "type-3934",
+   "self_type" : "type-3933",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23805,8 +23802,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3870",
-   "self_type" : "type-3869",
+   "referenced_type" : "type-3949",
+   "self_type" : "type-3948",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23814,8 +23811,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3878",
-   "self_type" : "type-3877",
+   "referenced_type" : "type-3975",
+   "self_type" : "type-3974",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23823,8 +23820,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3904",
-   "self_type" : "type-3903",
+   "referenced_type" : "type-4008",
+   "self_type" : "type-4007",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23832,8 +23829,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4055",
-   "self_type" : "type-4054",
+   "referenced_type" : "type-4089",
+   "self_type" : "type-4088",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23841,8 +23838,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4183",
-   "self_type" : "type-4182",
+   "referenced_type" : "type-4290",
+   "self_type" : "type-4289",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23850,8 +23847,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4330",
-   "self_type" : "type-4329",
+   "referenced_type" : "type-4477",
+   "self_type" : "type-4476",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23859,8 +23856,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4818",
-   "self_type" : "type-4817",
+   "referenced_type" : "type-4530",
+   "self_type" : "type-4529",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23868,8 +23865,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4900",
-   "self_type" : "type-4899",
+   "referenced_type" : "type-4538",
+   "self_type" : "type-4537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23877,8 +23874,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-4963",
-   "self_type" : "type-4962",
+   "referenced_type" : "type-4564",
+   "self_type" : "type-4563",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23886,8 +23883,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5071",
-   "self_type" : "type-5070",
+   "referenced_type" : "type-4715",
+   "self_type" : "type-4714",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23895,8 +23892,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5119",
-   "self_type" : "type-5118",
+   "referenced_type" : "type-4845",
+   "self_type" : "type-4844",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23904,8 +23901,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5432",
-   "self_type" : "type-5431",
+   "referenced_type" : "type-4994",
+   "self_type" : "type-4993",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23913,8 +23910,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5500",
-   "self_type" : "type-5499",
+   "referenced_type" : "type-5121",
+   "self_type" : "type-5120",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5160",
+   "self_type" : "type-5159",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5534",
+   "self_type" : "type-5533",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23931,15 +23946,6 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5664",
-   "self_type" : "type-5663",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
    "referenced_type" : "type-57",
    "self_type" : "type-56",
    "size" : 8,
@@ -23949,8 +23955,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5756",
-   "self_type" : "type-5755",
+   "referenced_type" : "type-5704",
+   "self_type" : "type-5703",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23958,8 +23964,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5817",
-   "self_type" : "type-5816",
+   "referenced_type" : "type-5766",
+   "self_type" : "type-5765",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23967,8 +23973,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5881",
-   "self_type" : "type-5880",
+   "referenced_type" : "type-5858",
+   "self_type" : "type-5857",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -23976,26 +23982,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5907",
-   "self_type" : "type-5906",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5922",
-   "self_type" : "type-5921",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-5948",
-   "self_type" : "type-5947",
+   "referenced_type" : "type-5919",
+   "self_type" : "type-5918",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24012,8 +24000,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6062",
-   "self_type" : "type-6061",
+   "referenced_type" : "type-6041",
+   "self_type" : "type-6040",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24021,8 +24009,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6193",
-   "self_type" : "type-6192",
+   "referenced_type" : "type-6137",
+   "self_type" : "type-6136",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24030,8 +24018,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6251",
-   "self_type" : "type-6250",
+   "referenced_type" : "type-6189",
+   "self_type" : "type-6188",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24039,8 +24027,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6340",
-   "self_type" : "type-6339",
+   "referenced_type" : "type-6278",
+   "self_type" : "type-6277",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24048,8 +24036,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6390",
-   "self_type" : "type-6389",
+   "referenced_type" : "type-6327",
+   "self_type" : "type-6326",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24057,8 +24045,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6484",
-   "self_type" : "type-6483",
+   "referenced_type" : "type-6407",
+   "self_type" : "type-6406",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24066,8 +24054,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6538",
-   "self_type" : "type-6537",
+   "referenced_type" : "type-6500",
+   "self_type" : "type-6499",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24075,8 +24063,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6634",
-   "self_type" : "type-6633",
+   "referenced_type" : "type-6526",
+   "self_type" : "type-6525",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24084,8 +24072,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6736",
-   "self_type" : "type-6735",
+   "referenced_type" : "type-6542",
+   "self_type" : "type-6541",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24093,8 +24081,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6747",
-   "self_type" : "type-6746",
+   "referenced_type" : "type-6564",
+   "self_type" : "type-6563",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24102,8 +24090,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6765",
-   "self_type" : "type-6764",
+   "referenced_type" : "type-6596",
+   "self_type" : "type-6595",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24111,8 +24099,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6786",
-   "self_type" : "type-6785",
+   "referenced_type" : "type-6674",
+   "self_type" : "type-6673",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24120,8 +24108,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6821",
-   "self_type" : "type-6820",
+   "referenced_type" : "type-6894",
+   "self_type" : "type-6893",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24129,8 +24117,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-6882",
-   "self_type" : "type-6881",
+   "referenced_type" : "type-7078",
+   "self_type" : "type-7077",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24138,8 +24126,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7031",
-   "self_type" : "type-7030",
+   "referenced_type" : "type-7140",
+   "self_type" : "type-7139",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24147,8 +24135,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7220",
-   "self_type" : "type-7219",
+   "referenced_type" : "type-7155",
+   "self_type" : "type-7154",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24156,8 +24144,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7268",
-   "self_type" : "type-7267",
+   "referenced_type" : "type-7192",
+   "self_type" : "type-7191",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24165,17 +24153,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7275",
-   "self_type" : "type-7274",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7302",
-   "self_type" : "type-7301",
+   "referenced_type" : "type-7341",
+   "self_type" : "type-7340",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24192,8 +24171,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7446",
-   "self_type" : "type-7445",
+   "referenced_type" : "type-7443",
+   "self_type" : "type-7442",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24201,8 +24180,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7455",
-   "self_type" : "type-7454",
+   "referenced_type" : "type-7479",
+   "self_type" : "type-7478",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24210,8 +24189,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7567",
-   "self_type" : "type-7566",
+   "referenced_type" : "type-7534",
+   "self_type" : "type-7533",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24219,8 +24198,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-7604",
-   "self_type" : "type-7603",
+   "referenced_type" : "type-7585",
+   "self_type" : "type-7584",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7614",
+   "self_type" : "type-7613",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7677",
+   "self_type" : "type-7676",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -24264,8 +24261,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
-   "referenced_type" : "type-3012",
-   "self_type" : "type-3013",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1565",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24273,8 +24270,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> > *",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> > *",
-   "referenced_type" : "type-3016",
-   "self_type" : "type-3017",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1569",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24282,8 +24279,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
-   "referenced_type" : "type-3459",
-   "self_type" : "type-3460",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2072",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24291,8 +24288,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long, unsigned long> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long, unsigned long> > *",
-   "referenced_type" : "type-3439",
-   "self_type" : "type-3440",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2050",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24300,8 +24297,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3477",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2089",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24309,8 +24306,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool, vector<Segment, allocator<Segment> > *> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool, vector<Segment, allocator<Segment> > *> > *",
-   "referenced_type" : "type-3495",
-   "self_type" : "type-3496",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2110",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24318,8 +24315,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> > *",
-   "referenced_type" : "type-3482",
-   "self_type" : "type-3483",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2096",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24327,8 +24324,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> > *",
-   "referenced_type" : "type-3499",
-   "self_type" : "type-3500",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2115",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24336,8 +24333,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> > *",
-   "referenced_type" : "type-3472",
-   "self_type" : "type-3473",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2085",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24345,8 +24342,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const sp<IConsumerListener> &, bool> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const sp<IConsumerListener> &, bool> > *",
-   "referenced_type" : "type-3455",
-   "self_type" : "type-3456",
+   "referenced_type" : "type-2066",
+   "self_type" : "type-2067",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24354,8 +24351,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int *, const sp<GraphicBuffer> &> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int *, const sp<GraphicBuffer> &> > *",
-   "referenced_type" : "type-3447",
-   "self_type" : "type-3448",
+   "referenced_type" : "type-2058",
+   "self_type" : "type-2059",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24363,8 +24360,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long, const sp<Fence> &> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long, const sp<Fence> &> > *",
-   "referenced_type" : "type-3451",
-   "self_type" : "type-3452",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2063",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24372,8 +24369,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
-   "referenced_type" : "type-3443",
-   "self_type" : "type-3444",
+   "referenced_type" : "type-2053",
+   "self_type" : "type-2054",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24381,8 +24378,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> > *",
-   "referenced_type" : "type-3491",
-   "self_type" : "type-3492",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2106",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24390,8 +24387,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int, unsigned int> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-3468",
-   "self_type" : "type-3469",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2081",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24399,8 +24396,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
-   "referenced_type" : "type-3486",
-   "self_type" : "type-3487",
+   "referenced_type" : "type-2099",
+   "self_type" : "type-2100",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24408,8 +24405,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long *> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long *> > *",
-   "referenced_type" : "type-3463",
-   "self_type" : "type-3464",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2076",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24417,8 +24414,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long> > *",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3481",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2094",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24426,8 +24423,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
-   "referenced_type" : "type-3529",
-   "self_type" : "type-3530",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2148",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24435,8 +24432,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long, unsigned long> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long, unsigned long> > *",
-   "referenced_type" : "type-3519",
-   "self_type" : "type-3520",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2137",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24444,8 +24441,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
-   "referenced_type" : "type-3537",
-   "self_type" : "type-3538",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2156",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24453,8 +24450,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool, vector<Segment, allocator<Segment> > *> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool, vector<Segment, allocator<Segment> > *> > *",
-   "referenced_type" : "type-3547",
-   "self_type" : "type-3548",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2168",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24462,8 +24459,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> > *",
-   "referenced_type" : "type-3541",
-   "self_type" : "type-3542",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2161",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24471,8 +24468,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
-   "referenced_type" : "type-3549",
-   "self_type" : "type-3550",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2170",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24480,8 +24477,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> > *",
-   "referenced_type" : "type-3535",
-   "self_type" : "type-3536",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2154",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24489,8 +24486,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const sp<IConsumerListener> &, bool> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const sp<IConsumerListener> &, bool> > *",
-   "referenced_type" : "type-3527",
-   "self_type" : "type-3528",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2145",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24498,8 +24495,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int *, const sp<GraphicBuffer> &> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int *, const sp<GraphicBuffer> &> > *",
-   "referenced_type" : "type-3523",
-   "self_type" : "type-3524",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2141",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24507,8 +24504,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long, const sp<Fence> &> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long, const sp<Fence> &> > *",
-   "referenced_type" : "type-3525",
-   "self_type" : "type-3526",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2143",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24516,8 +24513,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> > *",
-   "referenced_type" : "type-3521",
-   "self_type" : "type-3522",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2139",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24525,8 +24522,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
-   "referenced_type" : "type-3545",
-   "self_type" : "type-3546",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2165",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24534,8 +24531,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int, unsigned int> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-3533",
-   "self_type" : "type-3534",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2152",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24543,8 +24540,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
-   "referenced_type" : "type-3543",
-   "self_type" : "type-3544",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2163",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24552,8 +24549,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long *> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long *> > *",
-   "referenced_type" : "type-3531",
-   "self_type" : "type-3532",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2150",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24561,8 +24558,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long> > *",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long> > *",
-   "referenced_type" : "type-3539",
-   "self_type" : "type-3540",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2159",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24597,8 +24594,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-2987",
-   "self_type" : "type-2990",
+   "referenced_type" : "type-1538",
+   "self_type" : "type-1540",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24606,8 +24603,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-3143",
-   "self_type" : "type-3145",
+   "referenced_type" : "type-1718",
+   "self_type" : "type-1720",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -24634,7 +24631,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "referenced_type" : "type-163",
-   "self_type" : "type-1959",
+   "self_type" : "type-2676",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24643,7 +24640,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "name" : "android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "referenced_type" : "type-149",
-   "self_type" : "type-1954",
+   "self_type" : "type-2671",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24652,7 +24649,7 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "name" : "android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "referenced_type" : "type-141",
-   "self_type" : "type-1951",
+   "self_type" : "type-2668",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -24661,7 +24658,7 @@
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
    "referenced_type" : "type-1240",
-   "self_type" : "type-1946",
+   "self_type" : "type-2663",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -24670,7 +24667,7 @@
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
    "referenced_type" : "type-123",
-   "self_type" : "type-1940",
+   "self_type" : "type-1887",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -24678,8 +24675,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
    "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1741",
+   "referenced_type" : "type-2469",
+   "self_type" : "type-2468",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24687,8 +24684,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
    "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-4230",
-   "self_type" : "type-4229",
+   "referenced_type" : "type-4892",
+   "self_type" : "type-4891",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24696,8 +24693,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
    "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-6210",
-   "self_type" : "type-6209",
+   "referenced_type" : "type-5999",
+   "self_type" : "type-5998",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24705,8 +24702,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
    "name" : "android::TWGraphicBufferProducer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer, void> *",
-   "referenced_type" : "type-6825",
-   "self_type" : "type-6824",
+   "referenced_type" : "type-7044",
+   "self_type" : "type-7043",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24741,8 +24738,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<int> *",
    "name" : "android::Vector<int> *",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1972",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2689",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -24759,8 +24756,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-1626",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2394",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -24768,8 +24765,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
    "name" : "android::base::EagerEvaluator<char *, char *> *",
-   "referenced_type" : "type-4042",
-   "self_type" : "type-4045",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4705",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24777,8 +24774,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
    "name" : "android::base::EagerEvaluator<char *, const char *> *",
-   "referenced_type" : "type-4038",
-   "self_type" : "type-4040",
+   "referenced_type" : "type-4698",
+   "self_type" : "type-4700",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24786,8 +24783,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
    "name" : "android::base::EagerEvaluator<const char *, char *> *",
-   "referenced_type" : "type-4025",
-   "self_type" : "type-4029",
+   "referenced_type" : "type-4685",
+   "self_type" : "type-4689",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24795,8 +24792,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
    "name" : "android::base::EagerEvaluator<const char *, const char *> *",
-   "referenced_type" : "type-4009",
-   "self_type" : "type-4023",
+   "referenced_type" : "type-4669",
+   "self_type" : "type-4683",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24804,8 +24801,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
    "name" : "android::base::EagerEvaluator<const signed char *, const signed char *> *",
-   "referenced_type" : "type-4066",
-   "self_type" : "type-4071",
+   "referenced_type" : "type-4726",
+   "self_type" : "type-4731",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24813,8 +24810,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
    "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
-   "referenced_type" : "type-4073",
-   "self_type" : "type-4075",
+   "referenced_type" : "type-4733",
+   "self_type" : "type-4735",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24822,8 +24819,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
    "name" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *> *",
-   "referenced_type" : "type-4046",
-   "self_type" : "type-4049",
+   "referenced_type" : "type-4706",
+   "self_type" : "type-4709",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24831,8 +24828,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
    "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
-   "referenced_type" : "type-4050",
-   "self_type" : "type-4051",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4711",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24840,8 +24837,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
    "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
-   "referenced_type" : "type-4077",
-   "self_type" : "type-4083",
+   "referenced_type" : "type-4737",
+   "self_type" : "type-4743",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24849,8 +24846,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
    "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
-   "referenced_type" : "type-4084",
-   "self_type" : "type-4089",
+   "referenced_type" : "type-4744",
+   "self_type" : "type-4749",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24858,8 +24855,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
    "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
-   "referenced_type" : "type-4053",
-   "self_type" : "type-4058",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4718",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24867,8 +24864,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
    "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
-   "referenced_type" : "type-4059",
-   "self_type" : "type-4063",
+   "referenced_type" : "type-4719",
+   "self_type" : "type-4723",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24876,8 +24873,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::ErrnoRestorer *",
    "name" : "android::base::ErrnoRestorer *",
-   "referenced_type" : "type-4000",
-   "self_type" : "type-4163",
+   "referenced_type" : "type-4660",
+   "self_type" : "type-4825",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -24885,8 +24882,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2567",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -24903,8 +24900,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-2818",
-   "self_type" : "type-2817",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1362",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24921,8 +24918,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-2815",
-   "self_type" : "type-2814",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1359",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24930,8 +24927,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-2834",
-   "self_type" : "type-2839",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1382",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -24939,8 +24936,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-2855",
-   "self_type" : "type-2854",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1396",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -24948,8 +24945,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> *",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> *",
-   "referenced_type" : "type-4809",
-   "self_type" : "type-4810",
+   "referenced_type" : "type-7522",
+   "self_type" : "type-7523",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24957,8 +24954,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> > *",
-   "referenced_type" : "type-3704",
-   "self_type" : "type-3705",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4363",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24966,8 +24963,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> > *",
-   "referenced_type" : "type-3831",
-   "self_type" : "type-3832",
+   "referenced_type" : "type-4491",
+   "self_type" : "type-4492",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24975,8 +24972,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> > *",
-   "referenced_type" : "type-3710",
-   "self_type" : "type-3711",
+   "referenced_type" : "type-4368",
+   "self_type" : "type-4369",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24984,8 +24981,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > *",
-   "referenced_type" : "type-3837",
-   "self_type" : "type-3838",
+   "referenced_type" : "type-4497",
+   "self_type" : "type-4498",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -24993,8 +24990,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3699",
+   "referenced_type" : "type-4356",
+   "self_type" : "type-4357",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -25011,8 +25008,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<unsigned long> *",
    "name" : "android::hardware::Return<unsigned long> *",
-   "referenced_type" : "type-4813",
-   "self_type" : "type-4814",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7527",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -25075,7 +25072,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-382",
-   "self_type" : "type-4928",
+   "self_type" : "type-7640",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25084,7 +25081,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-373",
-   "self_type" : "type-3938",
+   "self_type" : "type-4598",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25093,7 +25090,7 @@
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
    "referenced_type" : "type-391",
-   "self_type" : "type-3691",
+   "self_type" : "type-4349",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -25111,7 +25108,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "referenced_type" : "type-595",
-   "self_type" : "type-1739",
+   "self_type" : "type-2466",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25128,8 +25125,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1731",
-   "self_type" : "type-1730",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2457",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25137,8 +25134,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
-   "referenced_type" : "type-4027",
-   "self_type" : "type-4026",
+   "referenced_type" : "type-4687",
+   "self_type" : "type-4686",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25146,8 +25143,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
-   "referenced_type" : "type-7430",
-   "self_type" : "type-7429",
+   "referenced_type" : "type-7325",
+   "self_type" : "type-7324",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25155,8 +25152,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
-   "referenced_type" : "type-3587",
-   "self_type" : "type-3586",
+   "referenced_type" : "type-4245",
+   "self_type" : "type-4244",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25164,8 +25161,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
-   "referenced_type" : "type-6986",
-   "self_type" : "type-6985",
+   "referenced_type" : "type-6856",
+   "self_type" : "type-6855",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25173,8 +25170,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-3808",
-   "self_type" : "type-3807",
+   "referenced_type" : "type-4468",
+   "self_type" : "type-4467",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25182,8 +25179,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-7214",
-   "self_type" : "type-7213",
+   "referenced_type" : "type-7070",
+   "self_type" : "type-7069",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25192,7 +25189,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "referenced_type" : "type-677",
-   "self_type" : "type-1752",
+   "self_type" : "type-2479",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25201,7 +25198,7 @@
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "referenced_type" : "type-604",
-   "self_type" : "type-1746",
+   "self_type" : "type-2473",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25209,8 +25206,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-1756",
-   "self_type" : "type-1755",
+   "referenced_type" : "type-2483",
+   "self_type" : "type-2482",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25218,8 +25215,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-4238",
-   "self_type" : "type-4237",
+   "referenced_type" : "type-4900",
+   "self_type" : "type-4899",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25227,8 +25224,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-6213",
-   "self_type" : "type-6212",
+   "referenced_type" : "type-6001",
+   "self_type" : "type-6000",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25236,8 +25233,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-6865",
-   "self_type" : "type-6864",
+   "referenced_type" : "type-7087",
+   "self_type" : "type-7086",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25245,8 +25242,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
-   "referenced_type" : "type-4942",
-   "self_type" : "type-4941",
+   "referenced_type" : "type-7656",
+   "self_type" : "type-7655",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25254,8 +25251,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
-   "referenced_type" : "type-3581",
-   "self_type" : "type-3580",
+   "referenced_type" : "type-4239",
+   "self_type" : "type-4238",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25263,8 +25260,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
-   "referenced_type" : "type-6982",
-   "self_type" : "type-6981",
+   "referenced_type" : "type-6852",
+   "self_type" : "type-6851",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25272,8 +25269,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-3801",
-   "self_type" : "type-3800",
+   "referenced_type" : "type-4460",
+   "self_type" : "type-4459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25281,8 +25278,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-4802",
-   "self_type" : "type-4801",
+   "referenced_type" : "type-7065",
+   "self_type" : "type-7064",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25290,8 +25287,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
-   "referenced_type" : "type-7210",
-   "self_type" : "type-7209",
+   "referenced_type" : "type-7511",
+   "self_type" : "type-7510",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25354,7 +25351,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "referenced_type" : "type-463",
-   "self_type" : "type-4968",
+   "self_type" : "type-7685",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25363,7 +25360,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "name" : "android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "referenced_type" : "type-454",
-   "self_type" : "type-3910",
+   "self_type" : "type-4570",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25372,7 +25369,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
    "referenced_type" : "type-453",
-   "self_type" : "type-3719",
+   "self_type" : "type-4378",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -25399,7 +25396,7 @@
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
    "referenced_type" : "type-531",
-   "self_type" : "type-1720",
+   "self_type" : "type-2447",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25408,7 +25405,7 @@
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
    "referenced_type" : "type-534",
-   "self_type" : "type-1724",
+   "self_type" : "type-2451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25417,7 +25414,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "referenced_type" : "type-164",
-   "self_type" : "type-1906",
+   "self_type" : "type-2626",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25426,7 +25423,7 @@
    "linker_set_key" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "name" : "android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "referenced_type" : "type-150",
-   "self_type" : "type-1904",
+   "self_type" : "type-2624",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25435,7 +25432,7 @@
    "linker_set_key" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "name" : "android::key_value_pair_t<unsigned int, unsigned int> *",
    "referenced_type" : "type-146",
-   "self_type" : "type-1902",
+   "self_type" : "type-2623",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -25453,7 +25450,7 @@
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "referenced_type" : "type-581",
-   "self_type" : "type-1786",
+   "self_type" : "type-2513",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25462,7 +25459,7 @@
    "linker_set_key" : "android::sp<android::ALooper> *",
    "name" : "android::sp<android::ALooper> *",
    "referenced_type" : "type-322",
-   "self_type" : "type-1517",
+   "self_type" : "type-2246",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25471,7 +25468,7 @@
    "linker_set_key" : "android::sp<android::AMessage> *",
    "name" : "android::sp<android::AMessage> *",
    "referenced_type" : "type-259",
-   "self_type" : "type-1425",
+   "self_type" : "type-1958",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25479,8 +25476,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer> *",
    "name" : "android::sp<android::BpGraphicBufferProducer> *",
-   "referenced_type" : "type-3573",
-   "self_type" : "type-3619",
+   "referenced_type" : "type-4231",
+   "self_type" : "type-4277",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25488,8 +25485,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::BpProducerListener> *",
    "name" : "android::sp<android::BpProducerListener> *",
-   "referenced_type" : "type-3798",
-   "self_type" : "type-3797",
+   "referenced_type" : "type-4457",
+   "self_type" : "type-4456",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25507,7 +25504,7 @@
    "linker_set_key" : "android::sp<android::ComponentWrapper> *",
    "name" : "android::sp<android::ComponentWrapper> *",
    "referenced_type" : "type-567",
-   "self_type" : "type-1763",
+   "self_type" : "type-2490",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25524,8 +25521,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1801",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-2524",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25534,7 +25531,7 @@
    "linker_set_key" : "android::sp<android::FrameDropper> *",
    "name" : "android::sp<android::FrameDropper> *",
    "referenced_type" : "type-578",
-   "self_type" : "type-1779",
+   "self_type" : "type-2506",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25561,7 +25558,7 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "referenced_type" : "type-473",
-   "self_type" : "type-1771",
+   "self_type" : "type-2498",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25569,8 +25566,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
    "name" : "android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25578,8 +25575,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
    "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
-   "referenced_type" : "type-3604",
-   "self_type" : "type-3603",
+   "referenced_type" : "type-4262",
+   "self_type" : "type-4261",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25587,8 +25584,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
    "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
-   "referenced_type" : "type-3613",
-   "self_type" : "type-3612",
+   "referenced_type" : "type-4271",
+   "self_type" : "type-4270",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25596,8 +25593,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
    "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
-   "referenced_type" : "type-4168",
-   "self_type" : "type-4177",
+   "referenced_type" : "type-4830",
+   "self_type" : "type-4839",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25605,8 +25602,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
    "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
-   "referenced_type" : "type-5056",
-   "self_type" : "type-5064",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5116",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25633,7 +25630,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> *",
    "name" : "android::sp<android::IConsumerListener> *",
    "referenced_type" : "type-940",
-   "self_type" : "type-1815",
+   "self_type" : "type-2536",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25642,7 +25639,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
    "name" : "android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-574",
-   "self_type" : "type-1773",
+   "self_type" : "type-2500",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25651,7 +25648,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
    "name" : "android::sp<android::IGraphicBufferProducer> *",
    "referenced_type" : "type-570",
-   "self_type" : "type-1759",
+   "self_type" : "type-2486",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25669,7 +25666,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> *",
    "name" : "android::sp<android::IProducerListener> *",
    "referenced_type" : "type-958",
-   "self_type" : "type-1818",
+   "self_type" : "type-2539",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25687,7 +25684,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> *",
    "name" : "android::sp<android::NativeHandle> *",
    "referenced_type" : "type-933",
-   "self_type" : "type-1718",
+   "self_type" : "type-1881",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25695,8 +25692,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1740",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2467",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25704,8 +25701,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
-   "referenced_type" : "type-1729",
-   "self_type" : "type-1732",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25713,8 +25710,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> *",
-   "referenced_type" : "type-3585",
-   "self_type" : "type-3622",
+   "referenced_type" : "type-4243",
+   "self_type" : "type-4280",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25722,8 +25719,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> *",
-   "referenced_type" : "type-3810",
-   "self_type" : "type-3809",
+   "referenced_type" : "type-4470",
+   "self_type" : "type-4469",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25731,8 +25728,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
-   "referenced_type" : "type-1751",
-   "self_type" : "type-1753",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2480",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25740,8 +25737,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1748",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2475",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25749,8 +25746,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> *",
-   "referenced_type" : "type-3579",
-   "self_type" : "type-3620",
+   "referenced_type" : "type-4237",
+   "self_type" : "type-4278",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25758,8 +25755,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> *",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> *",
-   "referenced_type" : "type-3803",
-   "self_type" : "type-3802",
+   "referenced_type" : "type-4463",
+   "self_type" : "type-4462",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25768,7 +25765,7 @@
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "android::sp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-515",
-   "self_type" : "type-3733",
+   "self_type" : "type-4392",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25776,8 +25773,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-3566",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-4224",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25785,8 +25782,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-1723",
-   "self_type" : "type-1725",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2452",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25794,8 +25791,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<const android::AHandler> *",
    "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2523",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25849,7 +25846,7 @@
    "linker_set_key" : "android::wp<android::IBinder> *",
    "name" : "android::wp<android::IBinder> *",
    "referenced_type" : "type-131",
-   "self_type" : "type-3624",
+   "self_type" : "type-4282",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -25858,7 +25855,7 @@
    "linker_set_key" : "android_dataspace_t *",
    "name" : "android_dataspace_t *",
    "referenced_type" : "type-173",
-   "self_type" : "type-3098",
+   "self_type" : "type-1668",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -25884,8 +25881,8 @@
    "alignment" : 8,
    "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
    "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
-   "referenced_type" : "type-2845",
-   "self_type" : "type-2849",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1391",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -25911,8 +25908,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AHandler *",
    "name" : "const android::AHandler *",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25920,8 +25917,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1789",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2517",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25929,8 +25926,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ALooper *",
    "name" : "const android::ALooper *",
-   "referenced_type" : "type-1562",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2303",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -25947,8 +25944,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AString *",
    "name" : "const android::AString *",
-   "referenced_type" : "type-1438",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2231",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -25983,8 +25980,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
    "name" : "const android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-3820",
-   "self_type" : "type-3821",
+   "referenced_type" : "type-4480",
+   "self_type" : "type-4481",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -26028,8 +26025,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-2535",
-   "self_type" : "type-2534",
+   "referenced_type" : "type-3635",
+   "self_type" : "type-3634",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26037,8 +26034,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-2584",
-   "self_type" : "type-2586",
+   "referenced_type" : "type-3684",
+   "self_type" : "type-3686",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26046,8 +26043,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-2692",
-   "self_type" : "type-2691",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3791",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26055,8 +26052,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5608",
-   "self_type" : "type-5607",
+   "referenced_type" : "type-5710",
+   "self_type" : "type-5709",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26064,8 +26061,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5657",
-   "self_type" : "type-5659",
+   "referenced_type" : "type-5759",
+   "self_type" : "type-5761",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26073,8 +26070,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-5765",
-   "self_type" : "type-5764",
+   "referenced_type" : "type-5867",
+   "self_type" : "type-5866",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26082,8 +26079,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6487",
-   "self_type" : "type-6486",
+   "referenced_type" : "type-6281",
+   "self_type" : "type-6280",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26091,8 +26088,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6533",
-   "self_type" : "type-6535",
+   "referenced_type" : "type-6323",
+   "self_type" : "type-6325",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -26100,8 +26097,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem *",
    "name" : "const android::BufferItem *",
-   "referenced_type" : "type-6642",
-   "self_type" : "type-6641",
+   "referenced_type" : "type-6414",
+   "self_type" : "type-6413",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -26118,8 +26115,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-3523",
+   "self_type" : "type-3525",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26127,8 +26124,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-5496",
-   "self_type" : "type-5498",
+   "referenced_type" : "type-5598",
+   "self_type" : "type-5600",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26136,8 +26133,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferQueueCore *",
    "name" : "const android::BufferQueueCore *",
-   "referenced_type" : "type-6386",
-   "self_type" : "type-6388",
+   "referenced_type" : "type-6184",
+   "self_type" : "type-6186",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26154,8 +26151,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ComponentWrapper *",
    "name" : "const android::ComponentWrapper *",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1770",
+   "referenced_type" : "type-2496",
+   "self_type" : "type-2497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26163,8 +26160,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-3515",
+   "self_type" : "type-3517",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26172,8 +26169,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-5488",
-   "self_type" : "type-5490",
+   "referenced_type" : "type-5590",
+   "self_type" : "type-5592",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26181,8 +26178,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ConsumerListener *",
    "name" : "const android::ConsumerListener *",
-   "referenced_type" : "type-6380",
-   "self_type" : "type-6383",
+   "referenced_type" : "type-6179",
+   "self_type" : "type-6181",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26208,8 +26205,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1813",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2534",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26217,8 +26214,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2350",
+   "referenced_type" : "type-3448",
+   "self_type" : "type-3450",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26226,8 +26223,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-2495",
-   "self_type" : "type-2497",
+   "referenced_type" : "type-3595",
+   "self_type" : "type-3597",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26235,8 +26232,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-2760",
-   "self_type" : "type-2767",
+   "referenced_type" : "type-3860",
+   "self_type" : "type-3867",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26244,8 +26241,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-3766",
-   "self_type" : "type-3772",
+   "referenced_type" : "type-4425",
+   "self_type" : "type-4431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26253,8 +26250,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4015",
-   "self_type" : "type-4017",
+   "referenced_type" : "type-4675",
+   "self_type" : "type-4677",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26262,8 +26259,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-4280",
-   "self_type" : "type-4282",
+   "referenced_type" : "type-4944",
+   "self_type" : "type-4946",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26271,8 +26268,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5421",
-   "self_type" : "type-5423",
+   "referenced_type" : "type-5523",
+   "self_type" : "type-5525",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26280,8 +26277,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5568",
-   "self_type" : "type-5570",
+   "referenced_type" : "type-5670",
+   "self_type" : "type-5672",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26289,8 +26286,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-5833",
-   "self_type" : "type-5840",
+   "referenced_type" : "type-5935",
+   "self_type" : "type-5942",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26298,8 +26295,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6227",
-   "self_type" : "type-6229",
+   "referenced_type" : "type-6016",
+   "self_type" : "type-6018",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26307,8 +26304,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6331",
-   "self_type" : "type-6333",
+   "referenced_type" : "type-6127",
+   "self_type" : "type-6129",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26316,8 +26313,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6461",
-   "self_type" : "type-6463",
+   "referenced_type" : "type-6255",
+   "self_type" : "type-6257",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26325,8 +26322,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-6690",
-   "self_type" : "type-6697",
+   "referenced_type" : "type-6455",
+   "self_type" : "type-6462",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26334,8 +26331,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7078",
-   "self_type" : "type-7090",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7036",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26343,8 +26340,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7176",
-   "self_type" : "type-7183",
+   "referenced_type" : "type-7206",
+   "self_type" : "type-7212",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26361,8 +26358,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-7421",
-   "self_type" : "type-7423",
+   "referenced_type" : "type-7316",
+   "self_type" : "type-7318",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26388,8 +26385,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::BufferItem> *",
    "name" : "const android::Flattenable<android::BufferItem> *",
-   "referenced_type" : "type-2957",
-   "self_type" : "type-2958",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1508",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -26397,8 +26394,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::Fence> *",
    "name" : "const android::Flattenable<android::Fence> *",
-   "referenced_type" : "type-3069",
-   "self_type" : "type-3070",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1636",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -26406,8 +26403,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
-   "referenced_type" : "type-3651",
-   "self_type" : "type-3652",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4310",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -26415,8 +26412,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> *",
    "name" : "const android::Flattenable<android::GraphicBuffer> *",
-   "referenced_type" : "type-3072",
-   "self_type" : "type-3073",
+   "referenced_type" : "type-1639",
+   "self_type" : "type-1640",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -26424,8 +26421,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
-   "referenced_type" : "type-3654",
-   "self_type" : "type-3655",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4313",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -26433,8 +26430,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
-   "referenced_type" : "type-3657",
-   "self_type" : "type-3658",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4316",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -26442,8 +26439,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FrameDropper *",
    "name" : "const android::FrameDropper *",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-2511",
+   "self_type" : "type-2512",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26460,8 +26457,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1677",
-   "self_type" : "type-1699",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1464",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26469,8 +26466,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2356",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2427",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26478,8 +26475,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2500",
-   "self_type" : "type-2502",
+   "referenced_type" : "type-3454",
+   "self_type" : "type-3456",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26487,8 +26484,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2800",
-   "self_type" : "type-2802",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3602",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26496,8 +26493,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-2925",
-   "self_type" : "type-2927",
+   "referenced_type" : "type-3900",
+   "self_type" : "type-3902",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26505,8 +26502,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-3563",
-   "self_type" : "type-3565",
+   "referenced_type" : "type-3993",
+   "self_type" : "type-3995",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26514,8 +26511,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-4175",
-   "self_type" : "type-4211",
+   "referenced_type" : "type-4221",
+   "self_type" : "type-4223",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26523,8 +26520,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5427",
-   "self_type" : "type-5429",
+   "referenced_type" : "type-4837",
+   "self_type" : "type-4873",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26532,8 +26529,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5573",
-   "self_type" : "type-5575",
+   "referenced_type" : "type-5529",
+   "self_type" : "type-5531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26541,8 +26538,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5873",
-   "self_type" : "type-5875",
+   "referenced_type" : "type-5675",
+   "self_type" : "type-5677",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26550,8 +26547,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-5966",
-   "self_type" : "type-5968",
+   "referenced_type" : "type-5975",
+   "self_type" : "type-5977",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26559,8 +26556,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6203",
-   "self_type" : "type-6208",
+   "referenced_type" : "type-5992",
+   "self_type" : "type-5997",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26568,8 +26565,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6336",
-   "self_type" : "type-6338",
+   "referenced_type" : "type-6132",
+   "self_type" : "type-6135",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26577,8 +26574,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6466",
-   "self_type" : "type-6468",
+   "referenced_type" : "type-6260",
+   "self_type" : "type-6262",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26586,8 +26583,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6658",
-   "self_type" : "type-6732",
+   "referenced_type" : "type-6493",
+   "self_type" : "type-6496",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26595,8 +26592,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6729",
-   "self_type" : "type-6731",
+   "referenced_type" : "type-6581",
+   "self_type" : "type-6583",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26604,8 +26601,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6808",
-   "self_type" : "type-6810",
+   "referenced_type" : "type-6826",
+   "self_type" : "type-6836",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26613,8 +26610,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-6962",
-   "self_type" : "type-6964",
+   "referenced_type" : "type-6837",
+   "self_type" : "type-6839",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26640,8 +26637,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferSource *",
    "name" : "const android::GraphicBufferSource *",
-   "referenced_type" : "type-1827",
-   "self_type" : "type-1828",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2549",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26649,8 +26646,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IBinder *",
    "name" : "const android::IBinder *",
-   "referenced_type" : "type-2971",
-   "self_type" : "type-2976",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26658,8 +26655,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IBinder::DeathRecipient *",
    "name" : "const android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-3660",
-   "self_type" : "type-3661",
+   "referenced_type" : "type-4318",
+   "self_type" : "type-4319",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -26676,8 +26673,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-2513",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1583",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26685,8 +26682,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-2660",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-3613",
+   "self_type" : "type-3615",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26694,8 +26691,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-3028",
-   "self_type" : "type-3030",
+   "referenced_type" : "type-3760",
+   "self_type" : "type-3762",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26703,8 +26700,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5586",
-   "self_type" : "type-5588",
+   "referenced_type" : "type-4062",
+   "self_type" : "type-4064",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26712,8 +26709,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-5733",
-   "self_type" : "type-5735",
+   "referenced_type" : "type-5688",
+   "self_type" : "type-5690",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26721,8 +26718,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6035",
-   "self_type" : "type-6037",
+   "referenced_type" : "type-5835",
+   "self_type" : "type-5837",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26730,8 +26727,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6473",
-   "self_type" : "type-6475",
+   "referenced_type" : "type-6265",
+   "self_type" : "type-6267",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26739,8 +26736,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6610",
-   "self_type" : "type-6612",
+   "referenced_type" : "type-6390",
+   "self_type" : "type-6392",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26748,8 +26745,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IConsumerListener *",
    "name" : "const android::IConsumerListener *",
-   "referenced_type" : "type-6855",
-   "self_type" : "type-6857",
+   "referenced_type" : "type-6649",
+   "self_type" : "type-6651",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26766,8 +26763,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-1776",
-   "self_type" : "type-1778",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1607",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26775,8 +26772,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-2396",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2503",
+   "self_type" : "type-2505",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26784,8 +26781,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-3045",
-   "self_type" : "type-3047",
+   "referenced_type" : "type-3496",
+   "self_type" : "type-3498",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26793,8 +26790,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-4255",
-   "self_type" : "type-4257",
+   "referenced_type" : "type-4079",
+   "self_type" : "type-4081",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26802,8 +26799,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-5469",
-   "self_type" : "type-5471",
+   "referenced_type" : "type-4917",
+   "self_type" : "type-4919",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26811,8 +26808,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6052",
-   "self_type" : "type-6054",
+   "referenced_type" : "type-5571",
+   "self_type" : "type-5573",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26820,8 +26817,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6220",
-   "self_type" : "type-6222",
+   "referenced_type" : "type-6009",
+   "self_type" : "type-6011",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26829,8 +26826,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6366",
-   "self_type" : "type-6368",
+   "referenced_type" : "type-6165",
+   "self_type" : "type-6167",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26838,8 +26835,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6870",
-   "self_type" : "type-6873",
+   "referenced_type" : "type-6664",
+   "self_type" : "type-6666",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26847,8 +26844,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-6951",
-   "self_type" : "type-6953",
+   "referenced_type" : "type-7151",
+   "self_type" : "type-7153",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26865,8 +26862,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-3506",
+   "self_type" : "type-3508",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26874,8 +26871,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-3592",
-   "self_type" : "type-3594",
+   "referenced_type" : "type-4250",
+   "self_type" : "type-4252",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26883,8 +26880,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-5479",
-   "self_type" : "type-5481",
+   "referenced_type" : "type-5581",
+   "self_type" : "type-5583",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26892,8 +26889,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6375",
-   "self_type" : "type-6377",
+   "referenced_type" : "type-6174",
+   "self_type" : "type-6176",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26901,8 +26898,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferProducer *",
    "name" : "const android::IGraphicBufferProducer *",
-   "referenced_type" : "type-6991",
-   "self_type" : "type-6993",
+   "referenced_type" : "type-6860",
+   "self_type" : "type-6862",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26928,8 +26925,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-2525",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-3625",
+   "self_type" : "type-3627",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26937,8 +26934,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-2667",
-   "self_type" : "type-2669",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3769",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26946,8 +26943,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3598",
-   "self_type" : "type-3600",
+   "referenced_type" : "type-4256",
+   "self_type" : "type-4258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26955,8 +26952,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-3793",
-   "self_type" : "type-3792",
+   "referenced_type" : "type-4452",
+   "self_type" : "type-4451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26964,8 +26961,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-4032",
-   "self_type" : "type-4034",
+   "referenced_type" : "type-4692",
+   "self_type" : "type-4694",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26973,8 +26970,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5598",
-   "self_type" : "type-5600",
+   "referenced_type" : "type-5700",
+   "self_type" : "type-5702",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26982,8 +26979,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-5740",
-   "self_type" : "type-5742",
+   "referenced_type" : "type-5842",
+   "self_type" : "type-5844",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -26991,8 +26988,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6480",
-   "self_type" : "type-6482",
+   "referenced_type" : "type-6273",
+   "self_type" : "type-6275",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27000,8 +26997,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6615",
-   "self_type" : "type-6617",
+   "referenced_type" : "type-6395",
+   "self_type" : "type-6397",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27009,8 +27006,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-6998",
-   "self_type" : "type-7000",
+   "referenced_type" : "type-6866",
+   "self_type" : "type-6868",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27018,8 +27015,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-7204",
-   "self_type" : "type-7203",
+   "referenced_type" : "type-7059",
+   "self_type" : "type-7058",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27027,8 +27024,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::IProducerListener *",
    "name" : "const android::IProducerListener *",
-   "referenced_type" : "type-7434",
-   "self_type" : "type-7436",
+   "referenced_type" : "type-7329",
+   "self_type" : "type-7331",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27063,8 +27060,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-3930",
-   "self_type" : "type-3931",
+   "referenced_type" : "type-4590",
+   "self_type" : "type-4591",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -27090,8 +27087,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
    "name" : "const android::LightRefBase<android::NativeHandle> *",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1957",
+   "referenced_type" : "type-2665",
+   "self_type" : "type-2674",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -27208,7 +27205,7 @@
    "linker_set_key" : "const android::Parcel *",
    "name" : "const android::Parcel *",
    "referenced_type" : "type-120",
-   "self_type" : "type-2964",
+   "self_type" : "type-1514",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27225,8 +27222,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::BufferItem> *",
    "name" : "const android::Parcel::FlattenableHelper<android::BufferItem> *",
-   "referenced_type" : "type-2972",
-   "self_type" : "type-2973",
+   "referenced_type" : "type-1521",
+   "self_type" : "type-1522",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27234,8 +27231,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::Fence> *",
    "name" : "const android::Parcel::FlattenableHelper<android::Fence> *",
-   "referenced_type" : "type-3093",
-   "self_type" : "type-3094",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1664",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27243,8 +27240,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
    "name" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
-   "referenced_type" : "type-3676",
-   "self_type" : "type-3677",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4335",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27252,8 +27249,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
    "name" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
-   "referenced_type" : "type-3088",
-   "self_type" : "type-3089",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1658",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27261,8 +27258,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
    "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
-   "referenced_type" : "type-3681",
-   "self_type" : "type-3682",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4340",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27270,8 +27267,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
    "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
-   "referenced_type" : "type-3686",
-   "self_type" : "type-3687",
+   "referenced_type" : "type-4344",
+   "self_type" : "type-4345",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -27297,8 +27294,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1968",
-   "self_type" : "type-1967",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1489",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27306,8 +27303,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2688",
-   "self_type" : "type-2687",
+   "referenced_type" : "type-1622",
+   "self_type" : "type-1621",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27315,8 +27312,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-2945",
-   "self_type" : "type-2944",
+   "referenced_type" : "type-2685",
+   "self_type" : "type-2684",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27324,8 +27321,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3058",
-   "self_type" : "type-3057",
+   "referenced_type" : "type-3788",
+   "self_type" : "type-3787",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27333,8 +27330,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3637",
-   "self_type" : "type-3636",
+   "referenced_type" : "type-4013",
+   "self_type" : "type-4012",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27342,8 +27339,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-3915",
-   "self_type" : "type-3914",
+   "referenced_type" : "type-4092",
+   "self_type" : "type-4091",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27351,8 +27348,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4079",
-   "self_type" : "type-4078",
+   "referenced_type" : "type-4295",
+   "self_type" : "type-4294",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27360,8 +27357,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4354",
-   "self_type" : "type-4353",
+   "referenced_type" : "type-4575",
+   "self_type" : "type-4574",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27369,8 +27366,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-4870",
-   "self_type" : "type-4869",
+   "referenced_type" : "type-4739",
+   "self_type" : "type-4738",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27378,8 +27375,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5014",
-   "self_type" : "type-5013",
+   "referenced_type" : "type-5022",
+   "self_type" : "type-5021",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27387,8 +27384,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5761",
-   "self_type" : "type-5760",
+   "referenced_type" : "type-5080",
+   "self_type" : "type-5079",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27396,8 +27393,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-5986",
-   "self_type" : "type-5985",
+   "referenced_type" : "type-5863",
+   "self_type" : "type-5862",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27405,8 +27402,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6065",
-   "self_type" : "type-6064",
+   "referenced_type" : "type-6046",
+   "self_type" : "type-6045",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27414,8 +27411,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6254",
-   "self_type" : "type-6253",
+   "referenced_type" : "type-6410",
+   "self_type" : "type-6409",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27423,8 +27420,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6637",
-   "self_type" : "type-6636",
+   "referenced_type" : "type-6600",
+   "self_type" : "type-6599",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27432,8 +27429,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6827",
-   "self_type" : "type-6826",
+   "referenced_type" : "type-6679",
+   "self_type" : "type-6678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27441,8 +27438,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-6887",
-   "self_type" : "type-6886",
+   "referenced_type" : "type-6899",
+   "self_type" : "type-6898",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27450,8 +27447,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7037",
-   "self_type" : "type-7036",
+   "referenced_type" : "type-7209",
+   "self_type" : "type-7208",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27459,8 +27456,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7317",
-   "self_type" : "type-7316",
+   "referenced_type" : "type-7356",
+   "self_type" : "type-7355",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27468,8 +27465,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7463",
-   "self_type" : "type-7462",
+   "referenced_type" : "type-7582",
+   "self_type" : "type-7581",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27477,8 +27474,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-7585",
-   "self_type" : "type-7584",
+   "referenced_type" : "type-7679",
+   "self_type" : "type-7678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27486,8 +27483,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-1450",
+   "self_type" : "type-1479",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -27495,8 +27492,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener> *",
    "name" : "const android::SafeBpInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-3001",
-   "self_type" : "type-3002",
+   "referenced_type" : "type-1552",
+   "self_type" : "type-1553",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27504,8 +27501,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
    "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-3291",
-   "self_type" : "type-3292",
+   "referenced_type" : "type-1888",
+   "self_type" : "type-1889",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -27522,8 +27519,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > > *",
-   "referenced_type" : "type-1960",
-   "self_type" : "type-1961",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27531,8 +27528,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > > *",
-   "referenced_type" : "type-1956",
-   "self_type" : "type-1958",
+   "referenced_type" : "type-2673",
+   "self_type" : "type-2675",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27540,8 +27537,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> > *",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1953",
+   "referenced_type" : "type-2669",
+   "self_type" : "type-2670",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -27550,7 +27547,7 @@
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
    "referenced_type" : "type-1248",
-   "self_type" : "type-1943",
+   "self_type" : "type-2660",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -27558,8 +27555,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1935",
-   "self_type" : "type-1936",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-2655",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -27576,8 +27573,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1965",
+   "referenced_type" : "type-2681",
+   "self_type" : "type-2682",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27594,8 +27591,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<int> *",
    "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-1973",
-   "self_type" : "type-1974",
+   "referenced_type" : "type-2690",
+   "self_type" : "type-2691",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -27612,8 +27609,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1949",
-   "self_type" : "type-1950",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2667",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -27621,8 +27618,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::base::ErrnoRestorer *",
    "name" : "const android::base::ErrnoRestorer *",
-   "referenced_type" : "type-3999",
-   "self_type" : "type-4005",
+   "referenced_type" : "type-4659",
+   "self_type" : "type-4665",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -27630,8 +27627,8 @@
    "alignment" : 8,
    "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-1861",
-   "self_type" : "type-1876",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2597",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -27648,8 +27645,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-2831",
-   "self_type" : "type-2832",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1376",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -27657,8 +27654,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> *",
-   "referenced_type" : "type-4953",
-   "self_type" : "type-4955",
+   "referenced_type" : "type-7670",
+   "self_type" : "type-7671",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27666,8 +27663,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> > *",
-   "referenced_type" : "type-3708",
-   "self_type" : "type-3709",
+   "referenced_type" : "type-4366",
+   "self_type" : "type-4367",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27675,8 +27672,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> > *",
-   "referenced_type" : "type-3835",
-   "self_type" : "type-3836",
+   "referenced_type" : "type-4495",
+   "self_type" : "type-4496",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27684,8 +27681,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> > *",
-   "referenced_type" : "type-3714",
-   "self_type" : "type-3715",
+   "referenced_type" : "type-4372",
+   "self_type" : "type-4373",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27693,8 +27690,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > *",
-   "referenced_type" : "type-3841",
-   "self_type" : "type-3842",
+   "referenced_type" : "type-4501",
+   "self_type" : "type-4502",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27702,8 +27699,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-3702",
-   "self_type" : "type-3703",
+   "referenced_type" : "type-4360",
+   "self_type" : "type-4361",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27711,8 +27708,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<int> *",
    "name" : "const android::hardware::Return<int> *",
-   "referenced_type" : "type-4041",
-   "self_type" : "type-4043",
+   "referenced_type" : "type-4701",
+   "self_type" : "type-4703",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27720,8 +27717,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<unsigned long> *",
    "name" : "const android::hardware::Return<unsigned long> *",
-   "referenced_type" : "type-4956",
-   "self_type" : "type-4957",
+   "referenced_type" : "type-7672",
+   "self_type" : "type-7673",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -27783,8 +27780,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-3693",
-   "self_type" : "type-3694",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4352",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -27810,8 +27807,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1735",
-   "self_type" : "type-1737",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2464",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27837,8 +27834,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_array<float, 16> *",
    "name" : "const android::hardware::hidl_array<float, 16> *",
-   "referenced_type" : "type-4068",
-   "self_type" : "type-4070",
+   "referenced_type" : "type-4728",
+   "self_type" : "type-4730",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27900,8 +27897,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> *",
    "name" : "const android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-3724",
-   "self_type" : "type-3725",
+   "referenced_type" : "type-4383",
+   "self_type" : "type-4384",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -27936,8 +27933,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1909",
+   "referenced_type" : "type-2621",
+   "self_type" : "type-2629",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27945,8 +27942,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1908",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2628",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27954,8 +27951,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int> *",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int> *",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1907",
+   "referenced_type" : "type-2615",
+   "self_type" : "type-2627",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -27964,7 +27961,7 @@
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "referenced_type" : "type-1311",
-   "self_type" : "type-1788",
+   "self_type" : "type-2515",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27973,7 +27970,7 @@
    "linker_set_key" : "const android::sp<android::ALooper> *",
    "name" : "const android::sp<android::ALooper> *",
    "referenced_type" : "type-321",
-   "self_type" : "type-1550",
+   "self_type" : "type-2279",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27981,8 +27978,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::AMessage> *",
    "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1476",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2205",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -27999,8 +27996,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
    "name" : "const android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1768",
+   "referenced_type" : "type-2493",
+   "self_type" : "type-2495",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28017,8 +28014,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-1802",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28026,8 +28023,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::FrameDropper> *",
    "name" : "const android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-2508",
+   "self_type" : "type-2509",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28044,8 +28041,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
    "name" : "const android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1826",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2547",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28053,8 +28050,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
-   "referenced_type" : "type-3609",
-   "self_type" : "type-3608",
+   "referenced_type" : "type-4267",
+   "self_type" : "type-4266",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28062,8 +28059,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
-   "referenced_type" : "type-3618",
-   "self_type" : "type-3617",
+   "referenced_type" : "type-4276",
+   "self_type" : "type-4275",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28071,8 +28068,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
-   "referenced_type" : "type-4167",
-   "self_type" : "type-4180",
+   "referenced_type" : "type-4829",
+   "self_type" : "type-4842",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28080,8 +28077,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
-   "referenced_type" : "type-5055",
-   "self_type" : "type-5067",
+   "referenced_type" : "type-5110",
+   "self_type" : "type-5119",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28089,8 +28086,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient> *",
    "name" : "const android::sp<android::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-3645",
-   "self_type" : "type-3728",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4387",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28117,7 +28114,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
    "name" : "const android::sp<android::IGraphicBufferConsumer> *",
    "referenced_type" : "type-790",
-   "self_type" : "type-1775",
+   "self_type" : "type-2502",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28125,8 +28122,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-1760",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-2489",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28134,8 +28131,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IInterface> *",
    "name" : "const android::sp<android::IInterface> *",
-   "referenced_type" : "type-2943",
-   "self_type" : "type-2948",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1494",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28153,7 +28150,7 @@
    "linker_set_key" : "const android::sp<android::NativeHandle> *",
    "name" : "const android::sp<android::NativeHandle> *",
    "referenced_type" : "type-935",
-   "self_type" : "type-3039",
+   "self_type" : "type-1598",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28161,8 +28158,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> *",
-   "referenced_type" : "type-1743",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2471",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28170,8 +28167,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> *",
-   "referenced_type" : "type-1733",
-   "self_type" : "type-1734",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2461",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28179,8 +28176,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer> *",
-   "referenced_type" : "type-3584",
-   "self_type" : "type-3623",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4281",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28188,8 +28185,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener> *",
-   "referenced_type" : "type-3813",
-   "self_type" : "type-3812",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28197,8 +28194,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> *",
-   "referenced_type" : "type-1757",
-   "self_type" : "type-1758",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2485",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28206,8 +28203,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> *",
-   "referenced_type" : "type-1749",
-   "self_type" : "type-1750",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2477",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28215,8 +28212,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer> *",
-   "referenced_type" : "type-3578",
-   "self_type" : "type-3621",
+   "referenced_type" : "type-4236",
+   "self_type" : "type-4279",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28224,8 +28221,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> *",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener> *",
-   "referenced_type" : "type-3806",
-   "self_type" : "type-3805",
+   "referenced_type" : "type-4466",
+   "self_type" : "type-4465",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28234,7 +28231,7 @@
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "referenced_type" : "type-514",
-   "self_type" : "type-1716",
+   "self_type" : "type-2444",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28242,8 +28239,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1722",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28251,8 +28248,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1728",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2455",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -28287,8 +28284,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient> *",
    "name" : "const android::wp<android::IBinder::DeathRecipient> *",
-   "referenced_type" : "type-3635",
-   "self_type" : "type-3650",
+   "referenced_type" : "type-4293",
+   "self_type" : "type-4308",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -28332,8 +28329,8 @@
    "alignment" : 8,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1592",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2321",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28360,7 +28357,7 @@
    "linker_set_key" : "const signed char *",
    "name" : "const signed char *",
    "referenced_type" : "type-437",
-   "self_type" : "type-4067",
+   "self_type" : "type-4727",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28368,8 +28365,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4102",
-   "self_type" : "type-4104",
+   "referenced_type" : "type-4763",
+   "self_type" : "type-4765",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28377,8 +28374,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4204",
-   "self_type" : "type-4206",
+   "referenced_type" : "type-4866",
+   "self_type" : "type-4868",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28386,8 +28383,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-4883",
-   "self_type" : "type-4886",
+   "referenced_type" : "type-5085",
+   "self_type" : "type-5091",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28395,8 +28392,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-5020",
-   "self_type" : "type-5027",
+   "referenced_type" : "type-5138",
+   "self_type" : "type-5140",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28404,8 +28401,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-5098",
-   "self_type" : "type-5100",
+   "referenced_type" : "type-7374",
+   "self_type" : "type-7376",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28413,8 +28410,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7484",
-   "self_type" : "type-7486",
+   "referenced_type" : "type-7468",
+   "self_type" : "type-7470",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28422,8 +28419,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
-   "referenced_type" : "type-7593",
-   "self_type" : "type-7595",
+   "referenced_type" : "type-7596",
+   "self_type" : "type-7598",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28486,7 +28483,7 @@
    "linker_set_key" : "int *",
    "name" : "int *",
    "referenced_type" : "type-4",
-   "self_type" : "type-1903",
+   "self_type" : "type-1510",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -28494,8 +28491,8 @@
    "alignment" : 8,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1614",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2343",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -28522,7 +28519,7 @@
    "linker_set_key" : "signed char *",
    "name" : "signed char *",
    "referenced_type" : "type-438",
-   "self_type" : "type-4074",
+   "self_type" : "type-4734",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -28530,8 +28527,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-3015",
-   "self_type" : "type-3014",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1566",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28539,8 +28536,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-3462",
-   "self_type" : "type-3461",
+   "referenced_type" : "type-2074",
+   "self_type" : "type-2073",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28548,8 +28545,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-6025",
-   "self_type" : "type-6024",
+   "referenced_type" : "type-4052",
+   "self_type" : "type-4051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28557,8 +28554,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-6135",
-   "self_type" : "type-6134",
+   "referenced_type" : "type-4162",
+   "self_type" : "type-4161",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28566,8 +28563,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-6847",
-   "self_type" : "type-6846",
+   "referenced_type" : "type-6640",
+   "self_type" : "type-6639",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28575,8 +28572,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<> *",
    "name" : "std::tuple<> *",
-   "referenced_type" : "type-6931",
-   "self_type" : "type-6930",
+   "referenced_type" : "type-6762",
+   "self_type" : "type-6761",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28584,8 +28581,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<BufferItem, long, unsigned long> *",
    "name" : "std::tuple<BufferItem, long, unsigned long> *",
-   "referenced_type" : "type-3442",
-   "self_type" : "type-3441",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28593,8 +28590,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<BufferItem, long, unsigned long> *",
    "name" : "std::tuple<BufferItem, long, unsigned long> *",
-   "referenced_type" : "type-6120",
-   "self_type" : "type-6119",
+   "referenced_type" : "type-4147",
+   "self_type" : "type-4146",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28602,8 +28599,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<BufferItem, long, unsigned long> *",
    "name" : "std::tuple<BufferItem, long, unsigned long> *",
-   "referenced_type" : "type-6919",
-   "self_type" : "type-6918",
+   "referenced_type" : "type-6746",
+   "self_type" : "type-6745",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28611,8 +28608,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<BufferItem> *",
    "name" : "std::tuple<BufferItem> *",
-   "referenced_type" : "type-3019",
-   "self_type" : "type-3018",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1570",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28620,8 +28617,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<BufferItem> *",
    "name" : "std::tuple<BufferItem> *",
-   "referenced_type" : "type-6028",
-   "self_type" : "type-6027",
+   "referenced_type" : "type-4055",
+   "self_type" : "type-4054",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28629,8 +28626,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<BufferItem> *",
    "name" : "std::tuple<BufferItem> *",
-   "referenced_type" : "type-6849",
-   "self_type" : "type-6848",
+   "referenced_type" : "type-6643",
+   "self_type" : "type-6642",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28638,8 +28635,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<String8, String8> *",
    "name" : "std::tuple<String8, String8> *",
-   "referenced_type" : "type-3502",
-   "self_type" : "type-3501",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2116",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28647,8 +28644,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<String8, String8> *",
    "name" : "std::tuple<String8, String8> *",
-   "referenced_type" : "type-6165",
-   "self_type" : "type-6164",
+   "referenced_type" : "type-4192",
+   "self_type" : "type-4191",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28656,8 +28653,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<String8, String8> *",
    "name" : "std::tuple<String8, String8> *",
-   "referenced_type" : "type-6950",
-   "self_type" : "type-6949",
+   "referenced_type" : "type-6792",
+   "self_type" : "type-6791",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28665,8 +28662,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<String8> *",
    "name" : "std::tuple<String8> *",
-   "referenced_type" : "type-3475",
-   "self_type" : "type-3474",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2086",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28674,8 +28671,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<String8> *",
    "name" : "std::tuple<String8> *",
-   "referenced_type" : "type-6145",
-   "self_type" : "type-6144",
+   "referenced_type" : "type-4172",
+   "self_type" : "type-4171",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28683,8 +28680,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<String8> *",
    "name" : "std::tuple<String8> *",
-   "referenced_type" : "type-6937",
-   "self_type" : "type-6936",
+   "referenced_type" : "type-6771",
+   "self_type" : "type-6770",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28692,8 +28689,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<android_dataspace_t> *",
    "name" : "std::tuple<android_dataspace_t> *",
-   "referenced_type" : "type-3479",
-   "self_type" : "type-3478",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2091",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28701,8 +28698,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<android_dataspace_t> *",
    "name" : "std::tuple<android_dataspace_t> *",
-   "referenced_type" : "type-6148",
-   "self_type" : "type-6147",
+   "referenced_type" : "type-4175",
+   "self_type" : "type-4174",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28710,8 +28707,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<android_dataspace_t> *",
    "name" : "std::tuple<android_dataspace_t> *",
-   "referenced_type" : "type-6939",
-   "self_type" : "type-6938",
+   "referenced_type" : "type-6775",
+   "self_type" : "type-6774",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28719,8 +28716,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
    "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
-   "referenced_type" : "type-3498",
-   "self_type" : "type-3497",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28728,8 +28725,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
    "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
-   "referenced_type" : "type-6162",
-   "self_type" : "type-6161",
+   "referenced_type" : "type-4189",
+   "self_type" : "type-4188",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28737,8 +28734,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
    "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
-   "referenced_type" : "type-6948",
-   "self_type" : "type-6947",
+   "referenced_type" : "type-6788",
+   "self_type" : "type-6787",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28746,8 +28743,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<bool> *",
    "name" : "std::tuple<bool> *",
-   "referenced_type" : "type-3485",
-   "self_type" : "type-3484",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2097",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28755,8 +28752,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<bool> *",
    "name" : "std::tuple<bool> *",
-   "referenced_type" : "type-6152",
-   "self_type" : "type-6151",
+   "referenced_type" : "type-4179",
+   "self_type" : "type-4178",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28764,8 +28761,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<bool> *",
    "name" : "std::tuple<bool> *",
-   "referenced_type" : "type-6941",
-   "self_type" : "type-6940",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6778",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28773,8 +28770,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
    "name" : "std::tuple<int, sp<GraphicBuffer> > *",
-   "referenced_type" : "type-3450",
-   "self_type" : "type-3449",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28782,8 +28779,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
    "name" : "std::tuple<int, sp<GraphicBuffer> > *",
-   "referenced_type" : "type-6126",
-   "self_type" : "type-6125",
+   "referenced_type" : "type-4153",
+   "self_type" : "type-4152",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28791,8 +28788,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
    "name" : "std::tuple<int, sp<GraphicBuffer> > *",
-   "referenced_type" : "type-6924",
-   "self_type" : "type-6923",
+   "referenced_type" : "type-6752",
+   "self_type" : "type-6751",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28800,8 +28797,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<int, unsigned long, sp<Fence> > *",
    "name" : "std::tuple<int, unsigned long, sp<Fence> > *",
-   "referenced_type" : "type-3454",
-   "self_type" : "type-3453",
+   "referenced_type" : "type-2065",
+   "self_type" : "type-2064",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28809,8 +28806,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<int, unsigned long, sp<Fence> > *",
    "name" : "std::tuple<int, unsigned long, sp<Fence> > *",
-   "referenced_type" : "type-6129",
-   "self_type" : "type-6128",
+   "referenced_type" : "type-4156",
+   "self_type" : "type-4155",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28818,8 +28815,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<int, unsigned long, sp<Fence> > *",
    "name" : "std::tuple<int, unsigned long, sp<Fence> > *",
-   "referenced_type" : "type-6926",
-   "self_type" : "type-6925",
+   "referenced_type" : "type-6755",
+   "self_type" : "type-6754",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28827,8 +28824,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<int> *",
    "name" : "std::tuple<int> *",
-   "referenced_type" : "type-3446",
-   "self_type" : "type-3445",
+   "referenced_type" : "type-2056",
+   "self_type" : "type-2055",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28836,8 +28833,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<int> *",
    "name" : "std::tuple<int> *",
-   "referenced_type" : "type-6123",
-   "self_type" : "type-6122",
+   "referenced_type" : "type-4150",
+   "self_type" : "type-4149",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28845,8 +28842,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<int> *",
    "name" : "std::tuple<int> *",
-   "referenced_type" : "type-6921",
-   "self_type" : "type-6920",
+   "referenced_type" : "type-6749",
+   "self_type" : "type-6748",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28854,8 +28851,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
    "name" : "std::tuple<sp<IConsumerListener>, bool> *",
-   "referenced_type" : "type-3458",
-   "self_type" : "type-3457",
+   "referenced_type" : "type-2070",
+   "self_type" : "type-2069",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28863,8 +28860,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
    "name" : "std::tuple<sp<IConsumerListener>, bool> *",
-   "referenced_type" : "type-6132",
-   "self_type" : "type-6131",
+   "referenced_type" : "type-4159",
+   "self_type" : "type-4158",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28872,8 +28869,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
    "name" : "std::tuple<sp<IConsumerListener>, bool> *",
-   "referenced_type" : "type-6928",
-   "self_type" : "type-6927",
+   "referenced_type" : "type-6759",
+   "self_type" : "type-6758",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28881,8 +28878,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
    "name" : "std::tuple<sp<NativeHandle> > *",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3493",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28890,8 +28887,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
    "name" : "std::tuple<sp<NativeHandle> > *",
-   "referenced_type" : "type-6159",
-   "self_type" : "type-6158",
+   "referenced_type" : "type-4186",
+   "self_type" : "type-4185",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28899,8 +28896,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
    "name" : "std::tuple<sp<NativeHandle> > *",
-   "referenced_type" : "type-6946",
-   "self_type" : "type-6945",
+   "referenced_type" : "type-6785",
+   "self_type" : "type-6784",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28908,8 +28905,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
    "name" : "std::tuple<unsigned int, unsigned int> *",
-   "referenced_type" : "type-3471",
-   "self_type" : "type-3470",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28917,8 +28914,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
    "name" : "std::tuple<unsigned int, unsigned int> *",
-   "referenced_type" : "type-6142",
-   "self_type" : "type-6141",
+   "referenced_type" : "type-4169",
+   "self_type" : "type-4168",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28926,8 +28923,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
    "name" : "std::tuple<unsigned int, unsigned int> *",
-   "referenced_type" : "type-6935",
-   "self_type" : "type-6934",
+   "referenced_type" : "type-6768",
+   "self_type" : "type-6767",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28935,8 +28932,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned int> *",
    "name" : "std::tuple<unsigned int> *",
-   "referenced_type" : "type-3490",
-   "self_type" : "type-3489",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2103",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28944,8 +28941,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned int> *",
    "name" : "std::tuple<unsigned int> *",
-   "referenced_type" : "type-6156",
-   "self_type" : "type-6155",
+   "referenced_type" : "type-4183",
+   "self_type" : "type-4182",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28953,8 +28950,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned int> *",
    "name" : "std::tuple<unsigned int> *",
-   "referenced_type" : "type-6944",
-   "self_type" : "type-6943",
+   "referenced_type" : "type-6782",
+   "self_type" : "type-6781",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28962,8 +28959,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned long> *",
    "name" : "std::tuple<unsigned long> *",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3465",
+   "referenced_type" : "type-2078",
+   "self_type" : "type-2077",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28971,8 +28968,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned long> *",
    "name" : "std::tuple<unsigned long> *",
-   "referenced_type" : "type-6138",
-   "self_type" : "type-6137",
+   "referenced_type" : "type-4165",
+   "self_type" : "type-4164",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28980,8 +28977,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::tuple<unsigned long> *",
    "name" : "std::tuple<unsigned long> *",
-   "referenced_type" : "type-6933",
-   "self_type" : "type-6932",
+   "referenced_type" : "type-6765",
+   "self_type" : "type-6764",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -28989,8 +28986,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
-   "referenced_type" : "type-3082",
-   "self_type" : "type-3081",
+   "referenced_type" : "type-1650",
+   "self_type" : "type-1649",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -28998,8 +28995,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
-   "referenced_type" : "type-6086",
-   "self_type" : "type-6085",
+   "referenced_type" : "type-4113",
+   "self_type" : "type-4112",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -29007,8 +29004,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
    "name" : "std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *",
-   "referenced_type" : "type-6902",
-   "self_type" : "type-6901",
+   "referenced_type" : "type-6699",
+   "self_type" : "type-6698",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -29016,8 +29013,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-1528",
+   "self_type" : "type-2362",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -29035,7 +29032,7 @@
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
    "referenced_type" : "type-2",
-   "self_type" : "type-3110",
+   "self_type" : "type-1682",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29044,7 +29041,7 @@
    "linker_set_key" : "unsigned long *",
    "name" : "unsigned long *",
    "referenced_type" : "type-11",
-   "self_type" : "type-3107",
+   "self_type" : "type-1679",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29070,8 +29067,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
    "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
-   "referenced_type" : "type-2838",
-   "self_type" : "type-2837",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1380",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -29131,8 +29128,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1930",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29141,8 +29138,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2358",
-   "self_type" : "type-2360",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1406",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29151,8 +29148,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1422",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29161,8 +29158,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2530",
+   "referenced_type" : "type-1441",
+   "self_type" : "type-1443",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29171,8 +29168,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2590",
-   "self_type" : "type-2592",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1484",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29181,8 +29178,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2682",
-   "self_type" : "type-2684",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1618",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29191,8 +29188,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2743",
-   "self_type" : "type-2742",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2653",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29201,8 +29198,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2807",
-   "self_type" : "type-2809",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3460",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29211,8 +29208,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2864",
-   "self_type" : "type-2866",
+   "referenced_type" : "type-3526",
+   "self_type" : "type-3528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29221,8 +29218,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2879",
-   "self_type" : "type-2881",
+   "referenced_type" : "type-3628",
+   "self_type" : "type-3630",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29231,8 +29228,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2905",
-   "self_type" : "type-2907",
+   "referenced_type" : "type-3690",
+   "self_type" : "type-3692",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29241,8 +29238,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2939",
-   "self_type" : "type-2941",
+   "referenced_type" : "type-3782",
+   "self_type" : "type-3784",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29251,8 +29248,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3054",
-   "self_type" : "type-3056",
+   "referenced_type" : "type-3843",
+   "self_type" : "type-3842",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29261,8 +29258,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3631",
-   "self_type" : "type-3633",
+   "referenced_type" : "type-3907",
+   "self_type" : "type-3909",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29271,8 +29268,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3816",
-   "self_type" : "type-3818",
+   "referenced_type" : "type-3933",
+   "self_type" : "type-3935",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29281,8 +29278,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3869",
-   "self_type" : "type-3871",
+   "referenced_type" : "type-3948",
+   "self_type" : "type-3950",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29291,8 +29288,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3877",
-   "self_type" : "type-3879",
+   "referenced_type" : "type-3974",
+   "self_type" : "type-3976",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29301,8 +29298,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3903",
-   "self_type" : "type-3905",
+   "referenced_type" : "type-4007",
+   "self_type" : "type-4009",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29311,8 +29308,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4054",
-   "self_type" : "type-4056",
+   "referenced_type" : "type-4088",
+   "self_type" : "type-4090",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29321,8 +29318,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4182",
-   "self_type" : "type-4184",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4291",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29331,8 +29328,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4329",
-   "self_type" : "type-4331",
+   "referenced_type" : "type-4476",
+   "self_type" : "type-4478",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29341,8 +29338,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4817",
-   "self_type" : "type-4819",
+   "referenced_type" : "type-4529",
+   "self_type" : "type-4531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29351,8 +29348,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4899",
-   "self_type" : "type-4901",
+   "referenced_type" : "type-4537",
+   "self_type" : "type-4539",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29361,8 +29358,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-4962",
-   "self_type" : "type-4964",
+   "referenced_type" : "type-4563",
+   "self_type" : "type-4565",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29371,8 +29368,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5070",
-   "self_type" : "type-5072",
+   "referenced_type" : "type-4714",
+   "self_type" : "type-4716",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29381,8 +29378,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5118",
-   "self_type" : "type-5120",
+   "referenced_type" : "type-4844",
+   "self_type" : "type-4846",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29391,8 +29388,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5431",
-   "self_type" : "type-5433",
+   "referenced_type" : "type-4993",
+   "self_type" : "type-4995",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29401,8 +29398,28 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5499",
-   "self_type" : "type-5501",
+   "referenced_type" : "type-5120",
+   "self_type" : "type-5122",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5159",
+   "self_type" : "type-5161",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5533",
+   "self_type" : "type-5535",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29421,16 +29438,6 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5663",
-   "self_type" : "type-5665",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "type-56",
    "self_type" : "type-55",
    "size" : 8,
@@ -29441,8 +29448,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5755",
-   "self_type" : "type-5757",
+   "referenced_type" : "type-5703",
+   "self_type" : "type-5705",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29451,8 +29458,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5816",
-   "self_type" : "type-5815",
+   "referenced_type" : "type-5765",
+   "self_type" : "type-5767",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29461,8 +29468,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5880",
-   "self_type" : "type-5882",
+   "referenced_type" : "type-5857",
+   "self_type" : "type-5859",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29471,28 +29478,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5906",
-   "self_type" : "type-5908",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5921",
-   "self_type" : "type-5923",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-5947",
-   "self_type" : "type-5949",
+   "referenced_type" : "type-5918",
+   "self_type" : "type-5917",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29511,8 +29498,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6061",
-   "self_type" : "type-6063",
+   "referenced_type" : "type-6040",
+   "self_type" : "type-6042",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29521,8 +29508,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6192",
-   "self_type" : "type-6194",
+   "referenced_type" : "type-6136",
+   "self_type" : "type-6138",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29531,8 +29518,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6250",
-   "self_type" : "type-6252",
+   "referenced_type" : "type-6188",
+   "self_type" : "type-6190",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29541,8 +29528,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6339",
-   "self_type" : "type-6341",
+   "referenced_type" : "type-6277",
+   "self_type" : "type-6279",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29551,8 +29538,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6389",
-   "self_type" : "type-6391",
+   "referenced_type" : "type-6326",
+   "self_type" : "type-6328",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29561,8 +29548,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6483",
-   "self_type" : "type-6485",
+   "referenced_type" : "type-6406",
+   "self_type" : "type-6408",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29571,8 +29558,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6537",
-   "self_type" : "type-6539",
+   "referenced_type" : "type-6499",
+   "self_type" : "type-6501",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29581,8 +29568,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6633",
-   "self_type" : "type-6635",
+   "referenced_type" : "type-6525",
+   "self_type" : "type-6527",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29591,8 +29578,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6735",
-   "self_type" : "type-6737",
+   "referenced_type" : "type-6541",
+   "self_type" : "type-6543",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29601,8 +29588,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6746",
-   "self_type" : "type-6748",
+   "referenced_type" : "type-6563",
+   "self_type" : "type-6565",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29611,8 +29598,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6764",
-   "self_type" : "type-6766",
+   "referenced_type" : "type-6595",
+   "self_type" : "type-6597",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29621,8 +29608,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6785",
-   "self_type" : "type-6787",
+   "referenced_type" : "type-6673",
+   "self_type" : "type-6675",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29631,8 +29618,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6820",
-   "self_type" : "type-6822",
+   "referenced_type" : "type-6893",
+   "self_type" : "type-6895",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29641,8 +29628,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-6881",
-   "self_type" : "type-6883",
+   "referenced_type" : "type-7077",
+   "self_type" : "type-7079",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29651,8 +29638,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7030",
-   "self_type" : "type-7032",
+   "referenced_type" : "type-7139",
+   "self_type" : "type-7141",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29661,8 +29648,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7219",
-   "self_type" : "type-7221",
+   "referenced_type" : "type-7154",
+   "self_type" : "type-7157",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29671,8 +29658,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7267",
-   "self_type" : "type-7269",
+   "referenced_type" : "type-7191",
+   "self_type" : "type-7193",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29681,18 +29668,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7274",
-   "self_type" : "type-7276",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "android::RefBase::weakref_impl *const",
-   "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7301",
-   "self_type" : "type-7303",
+   "referenced_type" : "type-7340",
+   "self_type" : "type-7342",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29711,8 +29688,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7445",
-   "self_type" : "type-7447",
+   "referenced_type" : "type-7442",
+   "self_type" : "type-7444",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29721,8 +29698,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7454",
-   "self_type" : "type-7458",
+   "referenced_type" : "type-7478",
+   "self_type" : "type-7481",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29731,8 +29708,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7566",
-   "self_type" : "type-7568",
+   "referenced_type" : "type-7533",
+   "self_type" : "type-7535",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29741,8 +29718,28 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-7603",
-   "self_type" : "type-7605",
+   "referenced_type" : "type-7584",
+   "self_type" : "type-7595",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7613",
+   "self_type" : "type-7615",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7676",
+   "self_type" : "type-7681",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -29771,8 +29768,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-2814",
-   "self_type" : "type-2829",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1373",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -29782,7 +29779,7 @@
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
    "referenced_type" : "type-264",
-   "self_type" : "type-1793",
+   "self_type" : "type-2520",
    "size" : 88,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29792,7 +29789,7 @@
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "referenced_type" : "type-583",
-   "self_type" : "type-1789",
+   "self_type" : "type-2516",
    "size" : 104,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29802,7 +29799,7 @@
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
    "referenced_type" : "type-248",
-   "self_type" : "type-1562",
+   "self_type" : "type-2291",
    "size" : 248,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -29822,7 +29819,7 @@
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
    "referenced_type" : "type-253",
-   "self_type" : "type-1438",
+   "self_type" : "type-2101",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -29862,7 +29859,7 @@
    "linker_set_key" : "const android::BnInterface<android::IProducerListener>",
    "name" : "const android::BnInterface<android::IProducerListener>",
    "referenced_type" : "type-82",
-   "self_type" : "type-3820",
+   "self_type" : "type-4480",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -29911,8 +29908,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-2342",
-   "self_type" : "type-2341",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1531",
+   "size" : 216,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1673",
+   "self_type" : "type-1672",
+   "size" : 216,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3442",
+   "self_type" : "type-3441",
    "size" : 216,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -29921,8 +29938,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-2536",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3635",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29931,8 +29948,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-2585",
-   "self_type" : "type-2584",
+   "referenced_type" : "type-3685",
+   "self_type" : "type-3684",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -29941,8 +29958,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-2693",
-   "self_type" : "type-2692",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3792",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29951,8 +29968,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-2980",
-   "self_type" : "type-2979",
+   "referenced_type" : "type-4043",
+   "self_type" : "type-4042",
    "size" : 216,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29961,8 +29978,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-3102",
-   "self_type" : "type-3101",
+   "referenced_type" : "type-4129",
+   "self_type" : "type-4128",
    "size" : 216,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -29971,8 +29988,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5415",
-   "self_type" : "type-5414",
+   "referenced_type" : "type-5517",
+   "self_type" : "type-5516",
    "size" : 216,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -29981,8 +29998,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5609",
-   "self_type" : "type-5608",
+   "referenced_type" : "type-5711",
+   "self_type" : "type-5710",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -29991,8 +30008,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5658",
-   "self_type" : "type-5657",
+   "referenced_type" : "type-5760",
+   "self_type" : "type-5759",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -30001,8 +30018,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-5766",
-   "self_type" : "type-5765",
+   "referenced_type" : "type-5868",
+   "self_type" : "type-5867",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30011,28 +30028,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6016",
-   "self_type" : "type-6015",
-   "size" : 216,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::BufferItem",
-   "name" : "const android::BufferItem",
-   "referenced_type" : "type-6102",
-   "self_type" : "type-6101",
-   "size" : 216,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::BufferItem",
-   "name" : "const android::BufferItem",
-   "referenced_type" : "type-6327",
-   "self_type" : "type-6326",
+   "referenced_type" : "type-6123",
+   "self_type" : "type-6122",
    "size" : 216,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
@@ -30041,8 +30038,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6488",
-   "self_type" : "type-6487",
+   "referenced_type" : "type-6282",
+   "self_type" : "type-6281",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30051,8 +30048,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6534",
-   "self_type" : "type-6533",
+   "referenced_type" : "type-6324",
+   "self_type" : "type-6323",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -30061,8 +30058,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6643",
-   "self_type" : "type-6642",
+   "referenced_type" : "type-6415",
+   "self_type" : "type-6414",
    "size" : 216,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -30071,6 +30068,26 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
+   "referenced_type" : "type-6633",
+   "self_type" : "type-6632",
+   "size" : 216,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6715",
+   "self_type" : "type-6714",
+   "size" : 216,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
    "referenced_type" : "type-682",
    "self_type" : "type-681",
    "size" : 216,
@@ -30081,26 +30098,6 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-6844",
-   "self_type" : "type-6843",
-   "size" : 216,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::BufferItem",
-   "name" : "const android::BufferItem",
-   "referenced_type" : "type-6912",
-   "self_type" : "type-6911",
-   "size" : 216,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::BufferItem",
-   "name" : "const android::BufferItem",
    "referenced_type" : "type-984",
    "self_type" : "type-983",
    "size" : 216,
@@ -30111,8 +30108,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3523",
    "size" : 5224,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30121,8 +30118,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-5497",
-   "self_type" : "type-5496",
+   "referenced_type" : "type-5599",
+   "self_type" : "type-5598",
    "size" : 5224,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30131,8 +30128,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferQueueCore",
    "name" : "const android::BufferQueueCore",
-   "referenced_type" : "type-6387",
-   "self_type" : "type-6386",
+   "referenced_type" : "type-6185",
+   "self_type" : "type-6184",
    "size" : 5224,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30152,7 +30149,7 @@
    "linker_set_key" : "const android::ComponentWrapper",
    "name" : "const android::ComponentWrapper",
    "referenced_type" : "type-569",
-   "self_type" : "type-1769",
+   "self_type" : "type-2496",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30161,8 +30158,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-2886",
-   "self_type" : "type-2885",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1425",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30171,8 +30168,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-5928",
-   "self_type" : "type-5927",
+   "referenced_type" : "type-3955",
+   "self_type" : "type-3954",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30181,8 +30178,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::CompositorTiming",
    "name" : "const android::CompositorTiming",
-   "referenced_type" : "type-6770",
-   "self_type" : "type-6769",
+   "referenced_type" : "type-6548",
+   "self_type" : "type-6547",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30191,8 +30188,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3515",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30201,8 +30198,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-5489",
-   "self_type" : "type-5488",
+   "referenced_type" : "type-5591",
+   "self_type" : "type-5590",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30211,8 +30208,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ConsumerListener",
    "name" : "const android::ConsumerListener",
-   "referenced_type" : "type-6381",
-   "self_type" : "type-6380",
+   "referenced_type" : "type-6180",
+   "self_type" : "type-6179",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30241,8 +30238,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-1812",
-   "self_type" : "type-1811",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2532",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30251,8 +30248,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2348",
+   "referenced_type" : "type-3449",
+   "self_type" : "type-3448",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30261,8 +30258,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-2496",
-   "self_type" : "type-2495",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3595",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30271,8 +30268,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-2761",
-   "self_type" : "type-2760",
+   "referenced_type" : "type-3861",
+   "self_type" : "type-3860",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30281,8 +30278,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-3767",
-   "self_type" : "type-3766",
+   "referenced_type" : "type-4426",
+   "self_type" : "type-4425",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30291,8 +30288,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4016",
-   "self_type" : "type-4015",
+   "referenced_type" : "type-4676",
+   "self_type" : "type-4675",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30301,8 +30298,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-4281",
-   "self_type" : "type-4280",
+   "referenced_type" : "type-4945",
+   "self_type" : "type-4944",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30311,8 +30308,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5422",
-   "self_type" : "type-5421",
+   "referenced_type" : "type-5524",
+   "self_type" : "type-5523",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30321,8 +30318,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5569",
-   "self_type" : "type-5568",
+   "referenced_type" : "type-5671",
+   "self_type" : "type-5670",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30331,8 +30328,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-5834",
-   "self_type" : "type-5833",
+   "referenced_type" : "type-5936",
+   "self_type" : "type-5935",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30341,8 +30338,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6228",
-   "self_type" : "type-6227",
+   "referenced_type" : "type-6017",
+   "self_type" : "type-6016",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30351,8 +30348,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6332",
-   "self_type" : "type-6331",
+   "referenced_type" : "type-6128",
+   "self_type" : "type-6127",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30361,8 +30358,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6462",
-   "self_type" : "type-6461",
+   "referenced_type" : "type-6256",
+   "self_type" : "type-6255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30371,8 +30368,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-6691",
-   "self_type" : "type-6690",
+   "referenced_type" : "type-6456",
+   "self_type" : "type-6455",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30381,8 +30378,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7079",
-   "self_type" : "type-7078",
+   "referenced_type" : "type-7030",
+   "self_type" : "type-7029",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30391,8 +30388,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7177",
-   "self_type" : "type-7176",
+   "referenced_type" : "type-7207",
+   "self_type" : "type-7206",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30411,8 +30408,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7422",
-   "self_type" : "type-7421",
+   "referenced_type" : "type-7317",
+   "self_type" : "type-7316",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30431,8 +30428,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-3923",
-   "self_type" : "type-3922",
+   "referenced_type" : "type-4583",
+   "self_type" : "type-4582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30441,8 +30438,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-4092",
-   "self_type" : "type-4091",
+   "referenced_type" : "type-4752",
+   "self_type" : "type-4751",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30451,8 +30448,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-7326",
-   "self_type" : "type-7325",
+   "referenced_type" : "type-7218",
+   "self_type" : "type-7217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30461,8 +30458,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-7474",
-   "self_type" : "type-7473",
+   "referenced_type" : "type-7366",
+   "self_type" : "type-7365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30482,7 +30479,7 @@
    "linker_set_key" : "const android::Flattenable<android::BufferItem>",
    "name" : "const android::Flattenable<android::BufferItem>",
    "referenced_type" : "type-22",
-   "self_type" : "type-2957",
+   "self_type" : "type-1507",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30492,7 +30489,7 @@
    "linker_set_key" : "const android::Flattenable<android::Fence>",
    "name" : "const android::Flattenable<android::Fence>",
    "referenced_type" : "type-17",
-   "self_type" : "type-3069",
+   "self_type" : "type-1635",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30502,7 +30499,7 @@
    "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "const android::Flattenable<android::FrameEventHistoryDelta>",
    "referenced_type" : "type-26",
-   "self_type" : "type-3651",
+   "self_type" : "type-4309",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30512,7 +30509,7 @@
    "linker_set_key" : "const android::Flattenable<android::GraphicBuffer>",
    "name" : "const android::Flattenable<android::GraphicBuffer>",
    "referenced_type" : "type-15",
-   "self_type" : "type-3072",
+   "self_type" : "type-1639",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30522,7 +30519,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "referenced_type" : "type-33",
-   "self_type" : "type-3654",
+   "self_type" : "type-4312",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30532,7 +30529,7 @@
    "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "referenced_type" : "type-35",
-   "self_type" : "type-3657",
+   "self_type" : "type-4315",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -30542,7 +30539,7 @@
    "linker_set_key" : "const android::FrameDropper",
    "name" : "const android::FrameDropper",
    "referenced_type" : "type-580",
-   "self_type" : "type-1784",
+   "self_type" : "type-2511",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30561,8 +30558,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1677",
+   "referenced_type" : "type-1462",
+   "self_type" : "type-1461",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30571,8 +30568,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2354",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2405",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30581,8 +30578,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2501",
-   "self_type" : "type-2500",
+   "referenced_type" : "type-3455",
+   "self_type" : "type-3454",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30591,8 +30588,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2801",
-   "self_type" : "type-2800",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3600",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30601,8 +30598,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-2926",
-   "self_type" : "type-2925",
+   "referenced_type" : "type-3901",
+   "self_type" : "type-3900",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30611,8 +30608,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-3564",
-   "self_type" : "type-3563",
+   "referenced_type" : "type-3994",
+   "self_type" : "type-3993",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30621,8 +30618,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-4176",
-   "self_type" : "type-4175",
+   "referenced_type" : "type-4222",
+   "self_type" : "type-4221",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30631,8 +30628,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5428",
-   "self_type" : "type-5427",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4837",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30641,8 +30638,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5574",
-   "self_type" : "type-5573",
+   "referenced_type" : "type-5530",
+   "self_type" : "type-5529",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30651,8 +30648,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5874",
-   "self_type" : "type-5873",
+   "referenced_type" : "type-5676",
+   "self_type" : "type-5675",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30661,8 +30658,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-5967",
-   "self_type" : "type-5966",
+   "referenced_type" : "type-5976",
+   "self_type" : "type-5975",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30671,8 +30668,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6204",
-   "self_type" : "type-6203",
+   "referenced_type" : "type-5993",
+   "self_type" : "type-5992",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30681,8 +30678,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6337",
-   "self_type" : "type-6336",
+   "referenced_type" : "type-6133",
+   "self_type" : "type-6132",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30691,8 +30688,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6467",
-   "self_type" : "type-6466",
+   "referenced_type" : "type-6261",
+   "self_type" : "type-6260",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30701,8 +30698,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6659",
-   "self_type" : "type-6658",
+   "referenced_type" : "type-6494",
+   "self_type" : "type-6493",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30711,8 +30708,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6730",
-   "self_type" : "type-6729",
+   "referenced_type" : "type-6582",
+   "self_type" : "type-6581",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30721,8 +30718,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6809",
-   "self_type" : "type-6808",
+   "referenced_type" : "type-6827",
+   "self_type" : "type-6826",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30731,8 +30728,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-6963",
-   "self_type" : "type-6962",
+   "referenced_type" : "type-6838",
+   "self_type" : "type-6837",
    "size" : 264,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30762,7 +30759,7 @@
    "linker_set_key" : "const android::GraphicBufferSource",
    "name" : "const android::GraphicBufferSource",
    "referenced_type" : "type-566",
-   "self_type" : "type-1827",
+   "self_type" : "type-2548",
    "size" : 432,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30792,7 +30789,7 @@
    "linker_set_key" : "const android::IBinder",
    "name" : "const android::IBinder",
    "referenced_type" : "type-53",
-   "self_type" : "type-2971",
+   "self_type" : "type-1520",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30802,7 +30799,7 @@
    "linker_set_key" : "const android::IBinder::DeathRecipient",
    "name" : "const android::IBinder::DeathRecipient",
    "referenced_type" : "type-176",
-   "self_type" : "type-3660",
+   "self_type" : "type-4318",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -30821,8 +30818,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-1582",
+   "self_type" : "type-1581",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30831,8 +30828,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-2661",
-   "self_type" : "type-2660",
+   "referenced_type" : "type-3614",
+   "self_type" : "type-3613",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30841,8 +30838,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-3029",
-   "self_type" : "type-3028",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30851,8 +30848,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5587",
-   "self_type" : "type-5586",
+   "referenced_type" : "type-4063",
+   "self_type" : "type-4062",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30861,8 +30858,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-5734",
-   "self_type" : "type-5733",
+   "referenced_type" : "type-5689",
+   "self_type" : "type-5688",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30871,8 +30868,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6036",
-   "self_type" : "type-6035",
+   "referenced_type" : "type-5836",
+   "self_type" : "type-5835",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30881,8 +30878,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6474",
-   "self_type" : "type-6473",
+   "referenced_type" : "type-6266",
+   "self_type" : "type-6265",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30891,8 +30888,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6611",
-   "self_type" : "type-6610",
+   "referenced_type" : "type-6391",
+   "self_type" : "type-6390",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30901,8 +30898,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IConsumerListener",
    "name" : "const android::IConsumerListener",
-   "referenced_type" : "type-6856",
-   "self_type" : "type-6855",
+   "referenced_type" : "type-6650",
+   "self_type" : "type-6649",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30921,8 +30918,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1606",
+   "self_type" : "type-1605",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30931,8 +30928,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2503",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30941,8 +30938,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-3046",
-   "self_type" : "type-3045",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3496",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30951,8 +30948,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-4256",
-   "self_type" : "type-4255",
+   "referenced_type" : "type-4080",
+   "self_type" : "type-4079",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30961,8 +30958,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-5470",
-   "self_type" : "type-5469",
+   "referenced_type" : "type-4918",
+   "self_type" : "type-4917",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30971,8 +30968,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6053",
-   "self_type" : "type-6052",
+   "referenced_type" : "type-5572",
+   "self_type" : "type-5571",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30981,8 +30978,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6221",
-   "self_type" : "type-6220",
+   "referenced_type" : "type-6010",
+   "self_type" : "type-6009",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -30991,8 +30988,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6367",
-   "self_type" : "type-6366",
+   "referenced_type" : "type-6166",
+   "self_type" : "type-6165",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31001,8 +30998,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6871",
-   "self_type" : "type-6870",
+   "referenced_type" : "type-6665",
+   "self_type" : "type-6664",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31011,8 +31008,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-6952",
-   "self_type" : "type-6951",
+   "referenced_type" : "type-7152",
+   "self_type" : "type-7151",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31031,8 +31028,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-3507",
+   "self_type" : "type-3506",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31041,8 +31038,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-3593",
-   "self_type" : "type-3592",
+   "referenced_type" : "type-4251",
+   "self_type" : "type-4250",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31051,8 +31048,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-5480",
-   "self_type" : "type-5479",
+   "referenced_type" : "type-5582",
+   "self_type" : "type-5581",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31061,8 +31058,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-6376",
-   "self_type" : "type-6375",
+   "referenced_type" : "type-6175",
+   "self_type" : "type-6174",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31071,8 +31068,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferProducer",
    "name" : "const android::IGraphicBufferProducer",
-   "referenced_type" : "type-6992",
-   "self_type" : "type-6991",
+   "referenced_type" : "type-6861",
+   "self_type" : "type-6860",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31101,8 +31098,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-2526",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3625",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31111,8 +31108,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-2668",
-   "self_type" : "type-2667",
+   "referenced_type" : "type-3768",
+   "self_type" : "type-3767",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31121,8 +31118,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3599",
-   "self_type" : "type-3598",
+   "referenced_type" : "type-4257",
+   "self_type" : "type-4256",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31131,8 +31128,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-3794",
-   "self_type" : "type-3793",
+   "referenced_type" : "type-4453",
+   "self_type" : "type-4452",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31141,8 +31138,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-4033",
-   "self_type" : "type-4032",
+   "referenced_type" : "type-4693",
+   "self_type" : "type-4692",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31151,8 +31148,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5599",
-   "self_type" : "type-5598",
+   "referenced_type" : "type-5701",
+   "self_type" : "type-5700",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31161,8 +31158,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-5741",
-   "self_type" : "type-5740",
+   "referenced_type" : "type-5843",
+   "self_type" : "type-5842",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31171,8 +31168,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6481",
-   "self_type" : "type-6480",
+   "referenced_type" : "type-6274",
+   "self_type" : "type-6273",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31181,8 +31178,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6616",
-   "self_type" : "type-6615",
+   "referenced_type" : "type-6396",
+   "self_type" : "type-6395",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31191,8 +31188,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-6999",
-   "self_type" : "type-6998",
+   "referenced_type" : "type-6867",
+   "self_type" : "type-6866",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31201,8 +31198,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-7205",
-   "self_type" : "type-7204",
+   "referenced_type" : "type-7060",
+   "self_type" : "type-7059",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31211,8 +31208,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::IProducerListener",
    "name" : "const android::IProducerListener",
-   "referenced_type" : "type-7435",
-   "self_type" : "type-7434",
+   "referenced_type" : "type-7330",
+   "self_type" : "type-7329",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31252,7 +31249,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-48",
-   "self_type" : "type-3930",
+   "self_type" : "type-4590",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31282,7 +31279,7 @@
    "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
    "name" : "const android::LightRefBase<android::NativeHandle>",
    "referenced_type" : "type-522",
-   "self_type" : "type-1948",
+   "self_type" : "type-2665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -31431,8 +31428,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::BufferItem>",
    "name" : "const android::Parcel::FlattenableHelper<android::BufferItem>",
-   "referenced_type" : "type-2968",
-   "self_type" : "type-2972",
+   "referenced_type" : "type-1517",
+   "self_type" : "type-1521",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31441,8 +31438,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::Fence>",
    "name" : "const android::Parcel::FlattenableHelper<android::Fence>",
-   "referenced_type" : "type-3090",
-   "self_type" : "type-3093",
+   "referenced_type" : "type-1659",
+   "self_type" : "type-1662",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31451,8 +31448,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
    "name" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
-   "referenced_type" : "type-3673",
-   "self_type" : "type-3676",
+   "referenced_type" : "type-4331",
+   "self_type" : "type-4334",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31461,8 +31458,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer>",
    "name" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer>",
-   "referenced_type" : "type-3085",
-   "self_type" : "type-3088",
+   "referenced_type" : "type-1654",
+   "self_type" : "type-1657",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31471,8 +31468,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
-   "referenced_type" : "type-3678",
-   "self_type" : "type-3681",
+   "referenced_type" : "type-4336",
+   "self_type" : "type-4339",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31481,8 +31478,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
-   "referenced_type" : "type-3683",
-   "self_type" : "type-3686",
+   "referenced_type" : "type-4341",
+   "self_type" : "type-4344",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -31521,8 +31518,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-1969",
-   "self_type" : "type-1968",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1490",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31531,8 +31528,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-1623",
+   "self_type" : "type-1622",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2685",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-3467",
+   "self_type" : "type-3466",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31541,8 +31558,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2689",
-   "self_type" : "type-2688",
+   "referenced_type" : "type-3789",
+   "self_type" : "type-3788",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31551,8 +31568,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-2946",
-   "self_type" : "type-2945",
+   "referenced_type" : "type-4014",
+   "self_type" : "type-4013",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31561,8 +31578,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3059",
-   "self_type" : "type-3058",
+   "referenced_type" : "type-4093",
+   "self_type" : "type-4092",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31571,8 +31588,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3638",
-   "self_type" : "type-3637",
+   "referenced_type" : "type-4296",
+   "self_type" : "type-4295",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31581,8 +31598,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-3916",
-   "self_type" : "type-3915",
+   "referenced_type" : "type-4576",
+   "self_type" : "type-4575",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31591,8 +31608,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4080",
-   "self_type" : "type-4079",
+   "referenced_type" : "type-4740",
+   "self_type" : "type-4739",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31601,8 +31618,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4355",
-   "self_type" : "type-4354",
+   "referenced_type" : "type-5023",
+   "self_type" : "type-5022",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31611,8 +31628,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-4871",
-   "self_type" : "type-4870",
+   "referenced_type" : "type-5081",
+   "self_type" : "type-5080",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31621,18 +31638,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5015",
-   "self_type" : "type-5014",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Rect",
-   "name" : "const android::Rect",
-   "referenced_type" : "type-5440",
-   "self_type" : "type-5439",
+   "referenced_type" : "type-5542",
+   "self_type" : "type-5541",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31641,8 +31648,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5762",
-   "self_type" : "type-5761",
+   "referenced_type" : "type-5864",
+   "self_type" : "type-5863",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31651,8 +31658,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-5987",
-   "self_type" : "type-5986",
+   "referenced_type" : "type-6047",
+   "self_type" : "type-6046",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31661,28 +31668,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6066",
-   "self_type" : "type-6065",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Rect",
-   "name" : "const android::Rect",
-   "referenced_type" : "type-6255",
-   "self_type" : "type-6254",
-   "size" : 16,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::Rect",
-   "name" : "const android::Rect",
-   "referenced_type" : "type-6347",
-   "self_type" : "type-6346",
+   "referenced_type" : "type-6145",
+   "self_type" : "type-6144",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -31691,8 +31678,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6638",
-   "self_type" : "type-6637",
+   "referenced_type" : "type-6411",
+   "self_type" : "type-6410",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31701,8 +31688,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6828",
-   "self_type" : "type-6827",
+   "referenced_type" : "type-6601",
+   "self_type" : "type-6600",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31711,8 +31698,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-6888",
-   "self_type" : "type-6887",
+   "referenced_type" : "type-6680",
+   "self_type" : "type-6679",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31721,8 +31708,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7038",
-   "self_type" : "type-7037",
+   "referenced_type" : "type-6900",
+   "self_type" : "type-6899",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31731,8 +31718,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7318",
-   "self_type" : "type-7317",
+   "referenced_type" : "type-7210",
+   "self_type" : "type-7209",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31741,8 +31728,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7464",
-   "self_type" : "type-7463",
+   "referenced_type" : "type-7357",
+   "self_type" : "type-7356",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31751,8 +31738,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Rect",
    "name" : "const android::Rect",
-   "referenced_type" : "type-7586",
-   "self_type" : "type-7585",
+   "referenced_type" : "type-7583",
+   "self_type" : "type-7582",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31767,12 +31754,22 @@
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-7680",
+   "self_type" : "type-7679",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
    "referenced_type" : "type-54",
-   "self_type" : "type-1351",
+   "self_type" : "type-1450",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -31781,8 +31778,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener>",
    "name" : "const android::SafeBpInterface<android::IConsumerListener>",
-   "referenced_type" : "type-2987",
-   "self_type" : "type-3001",
+   "referenced_type" : "type-1538",
+   "self_type" : "type-1552",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31791,8 +31788,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-3143",
-   "self_type" : "type-3291",
+   "referenced_type" : "type-1718",
+   "self_type" : "type-1888",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -31812,7 +31809,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "referenced_type" : "type-163",
-   "self_type" : "type-1960",
+   "self_type" : "type-2677",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31822,7 +31819,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "const android::SortedVector<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "referenced_type" : "type-149",
-   "self_type" : "type-1956",
+   "self_type" : "type-2673",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31832,7 +31829,7 @@
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<unsigned int, unsigned int> >",
    "referenced_type" : "type-141",
-   "self_type" : "type-1952",
+   "self_type" : "type-2669",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -31852,7 +31849,7 @@
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
    "referenced_type" : "type-123",
-   "self_type" : "type-1935",
+   "self_type" : "type-1877",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -31871,8 +31868,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1964",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2681",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31891,8 +31888,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<int>",
    "name" : "const android::Vector<int>",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1973",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2690",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -31912,7 +31909,7 @@
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
    "referenced_type" : "type-143",
-   "self_type" : "type-1949",
+   "self_type" : "type-2666",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -31921,8 +31918,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::base::ErrnoRestorer",
    "name" : "const android::base::ErrnoRestorer",
-   "referenced_type" : "type-4000",
-   "self_type" : "type-3999",
+   "referenced_type" : "type-4660",
+   "self_type" : "type-4659",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -31931,8 +31928,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-1834",
-   "self_type" : "type-1861",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2582",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -31951,8 +31948,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-2828",
-   "self_type" : "type-2831",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1375",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -31961,8 +31958,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-2834",
-   "self_type" : "type-2843",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1386",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -31971,8 +31968,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "name" : "const android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
-   "referenced_type" : "type-4809",
-   "self_type" : "type-4953",
+   "referenced_type" : "type-7522",
+   "self_type" : "type-7670",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31981,8 +31978,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> >",
-   "referenced_type" : "type-3704",
-   "self_type" : "type-3708",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4366",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31991,8 +31988,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> >",
-   "referenced_type" : "type-3831",
-   "self_type" : "type-3835",
+   "referenced_type" : "type-4491",
+   "self_type" : "type-4495",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32001,8 +31998,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> >",
-   "referenced_type" : "type-3710",
-   "self_type" : "type-3714",
+   "referenced_type" : "type-4368",
+   "self_type" : "type-4372",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32011,8 +32008,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> >",
-   "referenced_type" : "type-3837",
-   "self_type" : "type-3841",
+   "referenced_type" : "type-4497",
+   "self_type" : "type-4501",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32021,8 +32018,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3702",
+   "referenced_type" : "type-4356",
+   "self_type" : "type-4360",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32032,7 +32029,7 @@
    "linker_set_key" : "const android::hardware::Return<int>",
    "name" : "const android::hardware::Return<int>",
    "referenced_type" : "type-415",
-   "self_type" : "type-4041",
+   "self_type" : "type-4701",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32041,8 +32038,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<unsigned long>",
    "name" : "const android::hardware::Return<unsigned long>",
-   "referenced_type" : "type-4813",
-   "self_type" : "type-4956",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7672",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -32112,7 +32109,7 @@
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "referenced_type" : "type-391",
-   "self_type" : "type-3693",
+   "self_type" : "type-4351",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -32142,7 +32139,7 @@
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "referenced_type" : "type-588",
-   "self_type" : "type-3925",
+   "self_type" : "type-4585",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -32181,8 +32178,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
-   "referenced_type" : "type-1731",
-   "self_type" : "type-1735",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2462",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32412,7 +32409,7 @@
    "linker_set_key" : "const android::hardware::hidl_array<float, 16>",
    "name" : "const android::hardware::hidl_array<float, 16>",
    "referenced_type" : "type-484",
-   "self_type" : "type-4068",
+   "self_type" : "type-4728",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32502,7 +32499,7 @@
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
    "name" : "const android::hardware::hidl_vec<unsigned char>",
    "referenced_type" : "type-453",
-   "self_type" : "type-3724",
+   "self_type" : "type-4383",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -32562,7 +32559,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "referenced_type" : "type-164",
-   "self_type" : "type-1900",
+   "self_type" : "type-2621",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32572,7 +32569,7 @@
    "linker_set_key" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "const android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "referenced_type" : "type-150",
-   "self_type" : "type-1898",
+   "self_type" : "type-2619",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32582,7 +32579,7 @@
    "linker_set_key" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "name" : "const android::key_value_pair_t<unsigned int, unsigned int>",
    "referenced_type" : "type-146",
-   "self_type" : "type-1894",
+   "self_type" : "type-2615",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -32590,32 +32587,32 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-1684",
-   "self_type" : "type-1683",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2411",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-4187",
-   "self_type" : "type-4186",
+   "referenced_type" : "type-4849",
+   "self_type" : "type-4848",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-6206",
-   "self_type" : "type-6205",
+   "referenced_type" : "type-5995",
+   "self_type" : "type-5994",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-6671",
-   "self_type" : "type-6670",
+   "referenced_type" : "type-6831",
+   "self_type" : "type-6830",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -32644,7 +32641,7 @@
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
    "referenced_type" : "type-259",
-   "self_type" : "type-1448",
+   "self_type" : "type-2177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32653,8 +32650,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer>",
    "name" : "const android::sp<android::BpGraphicBufferProducer>",
-   "referenced_type" : "type-3573",
-   "self_type" : "type-3572",
+   "referenced_type" : "type-4231",
+   "self_type" : "type-4230",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32663,8 +32660,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::BpProducerListener>",
    "name" : "const android::sp<android::BpProducerListener>",
-   "referenced_type" : "type-3798",
-   "self_type" : "type-3859",
+   "referenced_type" : "type-4457",
+   "self_type" : "type-4519",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32684,7 +32681,7 @@
    "linker_set_key" : "const android::sp<android::ComponentWrapper>",
    "name" : "const android::sp<android::ComponentWrapper>",
    "referenced_type" : "type-567",
-   "self_type" : "type-1766",
+   "self_type" : "type-2493",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32703,8 +32700,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32714,7 +32711,7 @@
    "linker_set_key" : "const android::sp<android::FrameDropper>",
    "name" : "const android::sp<android::FrameDropper>",
    "referenced_type" : "type-578",
-   "self_type" : "type-1781",
+   "self_type" : "type-2508",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32743,8 +32740,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource>",
    "name" : "const android::sp<android::GraphicBufferSource>",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2546",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32753,8 +32750,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
-   "referenced_type" : "type-3604",
-   "self_type" : "type-3609",
+   "referenced_type" : "type-4262",
+   "self_type" : "type-4267",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32763,8 +32760,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
    "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
-   "referenced_type" : "type-3613",
-   "self_type" : "type-3618",
+   "referenced_type" : "type-4271",
+   "self_type" : "type-4276",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32773,8 +32770,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
-   "referenced_type" : "type-4168",
-   "self_type" : "type-4167",
+   "referenced_type" : "type-4830",
+   "self_type" : "type-4829",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32783,8 +32780,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
    "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
-   "referenced_type" : "type-5056",
-   "self_type" : "type-5055",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5110",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32794,7 +32791,7 @@
    "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient>",
    "name" : "const android::sp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-844",
-   "self_type" : "type-3645",
+   "self_type" : "type-4303",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -32834,7 +32831,7 @@
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
    "referenced_type" : "type-570",
-   "self_type" : "type-1760",
+   "self_type" : "type-2487",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32844,7 +32841,7 @@
    "linker_set_key" : "const android::sp<android::IInterface>",
    "name" : "const android::sp<android::IInterface>",
    "referenced_type" : "type-646",
-   "self_type" : "type-2943",
+   "self_type" : "type-1488",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32893,8 +32890,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-2823",
-   "self_type" : "type-2848",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1390",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -32903,8 +32900,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-2853",
-   "self_type" : "type-2852",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1394",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -32913,8 +32910,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer>",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1743",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2470",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32923,8 +32920,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
-   "referenced_type" : "type-1729",
-   "self_type" : "type-1733",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2460",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32933,8 +32930,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer>",
-   "referenced_type" : "type-3585",
-   "self_type" : "type-3584",
+   "referenced_type" : "type-4243",
+   "self_type" : "type-4242",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32943,8 +32940,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener>",
-   "referenced_type" : "type-3810",
-   "self_type" : "type-3813",
+   "referenced_type" : "type-4470",
+   "self_type" : "type-4473",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32953,8 +32950,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer>",
-   "referenced_type" : "type-1751",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2484",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32963,8 +32960,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1749",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2476",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32973,8 +32970,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer>",
-   "referenced_type" : "type-3579",
-   "self_type" : "type-3578",
+   "referenced_type" : "type-4237",
+   "self_type" : "type-4236",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -32983,8 +32980,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener>",
    "name" : "const android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener>",
-   "referenced_type" : "type-3803",
-   "self_type" : "type-3806",
+   "referenced_type" : "type-4463",
+   "self_type" : "type-4466",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33003,8 +33000,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase>",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1721",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2448",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33013,8 +33010,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification>",
-   "referenced_type" : "type-1723",
-   "self_type" : "type-1727",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2454",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33054,7 +33051,7 @@
    "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient>",
    "name" : "const android::wp<android::IBinder::DeathRecipient>",
    "referenced_type" : "type-174",
-   "self_type" : "type-3635",
+   "self_type" : "type-4293",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33064,7 +33061,7 @@
    "linker_set_key" : "const android::wp<android::IBinder>",
    "name" : "const android::wp<android::IBinder>",
    "referenced_type" : "type-131",
-   "self_type" : "type-3625",
+   "self_type" : "type-4283",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -33074,7 +33071,7 @@
    "linker_set_key" : "const android_cta861_3_metadata",
    "name" : "const android_cta861_3_metadata",
    "referenced_type" : "type-306",
-   "self_type" : "type-2934",
+   "self_type" : "type-1473",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -33094,7 +33091,7 @@
    "linker_set_key" : "const android_smpte2086_metadata",
    "name" : "const android_smpte2086_metadata",
    "referenced_type" : "type-305",
-   "self_type" : "type-2932",
+   "self_type" : "type-1471",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -33196,88 +33193,56 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2207",
+   "referenced_type" : "type-3308",
+   "self_type" : "type-3307",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-3541",
+   "self_type" : "type-3540",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-3650",
+   "self_type" : "type-3649",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2613",
-   "self_type" : "type-2612",
+   "referenced_type" : "type-3713",
+   "self_type" : "type-3712",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2735",
-   "self_type" : "type-2734",
+   "referenced_type" : "type-3835",
+   "self_type" : "type-3834",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3717",
-   "self_type" : "type-3716",
+   "referenced_type" : "type-4376",
+   "self_type" : "type-4375",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3845",
-   "self_type" : "type-3844",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const iter<is_const>",
-   "name" : "const iter<is_const>",
-   "referenced_type" : "type-3882",
-   "self_type" : "type-3881",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const iter<is_const>",
-   "name" : "const iter<is_const>",
-   "referenced_type" : "type-3907",
-   "self_type" : "type-3906",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const iter<is_const>",
-   "name" : "const iter<is_const>",
-   "referenced_type" : "type-4061",
-   "self_type" : "type-4060",
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const iter<is_const>",
-   "name" : "const iter<is_const>",
-   "referenced_type" : "type-4189",
-   "self_type" : "type-4188",
+   "referenced_type" : "type-4505",
+   "self_type" : "type-4504",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -33292,176 +33257,208 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-4777",
-   "self_type" : "type-4776",
+   "referenced_type" : "type-4542",
+   "self_type" : "type-4541",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-4821",
-   "self_type" : "type-4820",
+   "referenced_type" : "type-4567",
+   "self_type" : "type-4566",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-4903",
-   "self_type" : "type-4902",
+   "referenced_type" : "type-4721",
+   "self_type" : "type-4720",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-4966",
-   "self_type" : "type-4965",
+   "referenced_type" : "type-4851",
+   "self_type" : "type-4850",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-5076",
-   "self_type" : "type-5075",
+   "referenced_type" : "type-5124",
+   "self_type" : "type-5123",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-5142",
-   "self_type" : "type-5141",
+   "referenced_type" : "type-5177",
+   "self_type" : "type-5176",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-5281",
-   "self_type" : "type-5280",
+   "referenced_type" : "type-5383",
+   "self_type" : "type-5382",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-5514",
-   "self_type" : "type-5513",
+   "referenced_type" : "type-5616",
+   "self_type" : "type-5615",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-5623",
-   "self_type" : "type-5622",
+   "referenced_type" : "type-5725",
+   "self_type" : "type-5724",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-5686",
-   "self_type" : "type-5685",
+   "referenced_type" : "type-5788",
+   "self_type" : "type-5787",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-5808",
-   "self_type" : "type-5807",
+   "referenced_type" : "type-5910",
+   "self_type" : "type-5909",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-6276",
-   "self_type" : "type-6275",
+   "referenced_type" : "type-6068",
+   "self_type" : "type-6067",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-6408",
-   "self_type" : "type-6407",
+   "referenced_type" : "type-6202",
+   "self_type" : "type-6201",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-6504",
-   "self_type" : "type-6503",
+   "referenced_type" : "type-6298",
+   "self_type" : "type-6297",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-6560",
-   "self_type" : "type-6559",
+   "referenced_type" : "type-6342",
+   "self_type" : "type-6341",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-6667",
-   "self_type" : "type-6666",
+   "referenced_type" : "type-6434",
+   "self_type" : "type-6433",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-7119",
-   "self_type" : "type-7118",
+   "referenced_type" : "type-6973",
+   "self_type" : "type-6972",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-7243",
-   "self_type" : "type-7242",
+   "referenced_type" : "type-7107",
+   "self_type" : "type-7106",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-7278",
-   "self_type" : "type-7277",
+   "referenced_type" : "type-7160",
+   "self_type" : "type-7159",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-7306",
-   "self_type" : "type-7305",
+   "referenced_type" : "type-7196",
+   "self_type" : "type-7195",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-7450",
-   "self_type" : "type-7449",
+   "referenced_type" : "type-7346",
+   "self_type" : "type-7345",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-7572",
-   "self_type" : "type-7571",
+   "referenced_type" : "type-7446",
+   "self_type" : "type-7445",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7483",
+   "self_type" : "type-7482",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7537",
+   "self_type" : "type-7536",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7617",
+   "self_type" : "type-7616",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7683",
+   "self_type" : "type-7682",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -33477,8 +33474,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2315",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -33537,8 +33534,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-2292",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-3392",
+   "self_type" : "type-3391",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33547,8 +33544,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-2464",
-   "self_type" : "type-2463",
+   "referenced_type" : "type-3564",
+   "self_type" : "type-3563",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33557,8 +33554,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-2766",
-   "self_type" : "type-2765",
+   "referenced_type" : "type-3866",
+   "self_type" : "type-3865",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33567,8 +33564,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-3759",
-   "self_type" : "type-3758",
+   "referenced_type" : "type-4418",
+   "self_type" : "type-4417",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33577,8 +33574,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-3967",
-   "self_type" : "type-3966",
+   "referenced_type" : "type-4627",
+   "self_type" : "type-4626",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33587,8 +33584,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-4135",
-   "self_type" : "type-4134",
+   "referenced_type" : "type-4797",
+   "self_type" : "type-4796",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33597,8 +33594,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-4896",
-   "self_type" : "type-4895",
+   "referenced_type" : "type-5101",
+   "self_type" : "type-5100",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33607,8 +33604,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-5043",
-   "self_type" : "type-5042",
+   "referenced_type" : "type-5203",
+   "self_type" : "type-5202",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33617,8 +33614,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-5169",
-   "self_type" : "type-5168",
+   "referenced_type" : "type-5467",
+   "self_type" : "type-5466",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33627,8 +33624,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-5365",
-   "self_type" : "type-5364",
+   "referenced_type" : "type-5639",
+   "self_type" : "type-5638",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33637,18 +33634,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-5537",
-   "self_type" : "type-5536",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-5839",
-   "self_type" : "type-5838",
+   "referenced_type" : "type-5941",
+   "self_type" : "type-5940",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33667,8 +33654,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-6298",
-   "self_type" : "type-6297",
+   "referenced_type" : "type-6093",
+   "self_type" : "type-6092",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33677,8 +33664,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-6432",
-   "self_type" : "type-6431",
+   "referenced_type" : "type-6225",
+   "self_type" : "type-6224",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33687,8 +33674,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-6696",
-   "self_type" : "type-6695",
+   "referenced_type" : "type-6461",
+   "self_type" : "type-6460",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33697,8 +33684,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-7168",
-   "self_type" : "type-7167",
+   "referenced_type" : "type-7021",
+   "self_type" : "type-7020",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33707,8 +33694,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-7372",
-   "self_type" : "type-7371",
+   "referenced_type" : "type-7268",
+   "self_type" : "type-7267",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33717,8 +33704,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
-   "referenced_type" : "type-7514",
-   "self_type" : "type-7513",
+   "referenced_type" : "type-7403",
+   "self_type" : "type-7402",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
+   "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode, 2>",
+   "referenced_type" : "type-7608",
+   "self_type" : "type-7607",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33747,8 +33744,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-3390",
+   "self_type" : "type-3389",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33757,8 +33754,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-2462",
-   "self_type" : "type-2461",
+   "referenced_type" : "type-3562",
+   "self_type" : "type-3561",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33767,8 +33764,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-2764",
-   "self_type" : "type-2763",
+   "referenced_type" : "type-3864",
+   "self_type" : "type-3863",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33777,8 +33774,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-3755",
-   "self_type" : "type-3754",
+   "referenced_type" : "type-4414",
+   "self_type" : "type-4413",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33787,8 +33784,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-3965",
-   "self_type" : "type-3964",
+   "referenced_type" : "type-4625",
+   "self_type" : "type-4624",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33797,8 +33794,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-4133",
-   "self_type" : "type-4132",
+   "referenced_type" : "type-4795",
+   "self_type" : "type-4794",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33807,8 +33804,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-4894",
-   "self_type" : "type-4893",
+   "referenced_type" : "type-5099",
+   "self_type" : "type-5098",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33817,8 +33814,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-5041",
-   "self_type" : "type-5040",
+   "referenced_type" : "type-5201",
+   "self_type" : "type-5200",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33827,8 +33824,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-5167",
-   "self_type" : "type-5166",
+   "referenced_type" : "type-5465",
+   "self_type" : "type-5464",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33837,8 +33834,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-5363",
-   "self_type" : "type-5362",
+   "referenced_type" : "type-5637",
+   "self_type" : "type-5636",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33847,18 +33844,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-5535",
-   "self_type" : "type-5534",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-5837",
-   "self_type" : "type-5836",
+   "referenced_type" : "type-5939",
+   "self_type" : "type-5938",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33877,8 +33864,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-6296",
-   "self_type" : "type-6295",
+   "referenced_type" : "type-6091",
+   "self_type" : "type-6090",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33887,8 +33874,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-6430",
-   "self_type" : "type-6429",
+   "referenced_type" : "type-6223",
+   "self_type" : "type-6222",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33897,8 +33884,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-6693",
-   "self_type" : "type-6692",
+   "referenced_type" : "type-6459",
+   "self_type" : "type-6458",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33907,8 +33894,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-7163",
-   "self_type" : "type-7162",
+   "referenced_type" : "type-7017",
+   "self_type" : "type-7016",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33917,8 +33904,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-7370",
-   "self_type" : "type-7369",
+   "referenced_type" : "type-7266",
+   "self_type" : "type-7265",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33927,8 +33914,18 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
-   "referenced_type" : "type-7512",
-   "self_type" : "type-7511",
+   "referenced_type" : "type-7401",
+   "self_type" : "type-7400",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
+   "name" : "const std::array<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State, 3>",
+   "referenced_type" : "type-7606",
+   "self_type" : "type-7605",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h"
   },
@@ -33957,8 +33954,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2303",
+   "referenced_type" : "type-3404",
+   "self_type" : "type-3403",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -33967,8 +33964,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-2470",
-   "self_type" : "type-2469",
+   "referenced_type" : "type-3570",
+   "self_type" : "type-3569",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -33977,8 +33974,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-2773",
-   "self_type" : "type-2772",
+   "referenced_type" : "type-3873",
+   "self_type" : "type-3872",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -33987,8 +33984,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-3765",
-   "self_type" : "type-3764",
+   "referenced_type" : "type-4424",
+   "self_type" : "type-4423",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -33997,8 +33994,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-3973",
-   "self_type" : "type-3972",
+   "referenced_type" : "type-4633",
+   "self_type" : "type-4632",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34007,8 +34004,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-4141",
-   "self_type" : "type-4140",
+   "referenced_type" : "type-4803",
+   "self_type" : "type-4802",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34017,8 +34014,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-4828",
-   "self_type" : "type-4827",
+   "referenced_type" : "type-5107",
+   "self_type" : "type-5106",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34027,8 +34024,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-5050",
-   "self_type" : "type-5049",
+   "referenced_type" : "type-5210",
+   "self_type" : "type-5209",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34037,8 +34034,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-5176",
-   "self_type" : "type-5175",
+   "referenced_type" : "type-5479",
+   "self_type" : "type-5478",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34047,8 +34044,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-5377",
-   "self_type" : "type-5376",
+   "referenced_type" : "type-5645",
+   "self_type" : "type-5644",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34057,8 +34054,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-5543",
-   "self_type" : "type-5542",
+   "referenced_type" : "type-5948",
+   "self_type" : "type-5947",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34067,8 +34064,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-5846",
-   "self_type" : "type-5845",
+   "referenced_type" : "type-6099",
+   "self_type" : "type-6098",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34087,8 +34084,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-6305",
-   "self_type" : "type-6304",
+   "referenced_type" : "type-6231",
+   "self_type" : "type-6230",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34097,8 +34094,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-6438",
-   "self_type" : "type-6437",
+   "referenced_type" : "type-6468",
+   "self_type" : "type-6467",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34107,8 +34104,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-6703",
-   "self_type" : "type-6702",
+   "referenced_type" : "type-7028",
+   "self_type" : "type-7027",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34117,8 +34114,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-7175",
-   "self_type" : "type-7174",
+   "referenced_type" : "type-7276",
+   "self_type" : "type-7275",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34127,8 +34124,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-7378",
-   "self_type" : "type-7377",
+   "referenced_type" : "type-7409",
+   "self_type" : "type-7408",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34137,8 +34134,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::ConnectionType, 5>",
-   "referenced_type" : "type-7521",
-   "self_type" : "type-7520",
+   "referenced_type" : "type-7544",
+   "self_type" : "type-7543",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34167,8 +34164,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-2302",
-   "self_type" : "type-2301",
+   "referenced_type" : "type-3402",
+   "self_type" : "type-3401",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34177,8 +34174,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-2468",
-   "self_type" : "type-2467",
+   "referenced_type" : "type-3568",
+   "self_type" : "type-3567",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34187,8 +34184,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-2771",
-   "self_type" : "type-2770",
+   "referenced_type" : "type-3871",
+   "self_type" : "type-3870",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34197,8 +34194,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-3763",
-   "self_type" : "type-3762",
+   "referenced_type" : "type-4422",
+   "self_type" : "type-4421",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34207,8 +34204,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-3971",
-   "self_type" : "type-3970",
+   "referenced_type" : "type-4631",
+   "self_type" : "type-4630",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34217,8 +34214,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-4139",
-   "self_type" : "type-4138",
+   "referenced_type" : "type-4801",
+   "self_type" : "type-4800",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34227,8 +34224,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-4826",
-   "self_type" : "type-4825",
+   "referenced_type" : "type-5105",
+   "self_type" : "type-5104",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34237,8 +34234,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-5048",
-   "self_type" : "type-5047",
+   "referenced_type" : "type-5208",
+   "self_type" : "type-5207",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34247,8 +34244,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-5174",
-   "self_type" : "type-5173",
+   "referenced_type" : "type-5477",
+   "self_type" : "type-5476",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34257,8 +34254,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-5375",
-   "self_type" : "type-5374",
+   "referenced_type" : "type-5643",
+   "self_type" : "type-5642",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34267,8 +34264,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-5541",
-   "self_type" : "type-5540",
+   "referenced_type" : "type-5946",
+   "self_type" : "type-5945",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34277,8 +34274,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-5844",
-   "self_type" : "type-5843",
+   "referenced_type" : "type-6097",
+   "self_type" : "type-6096",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34297,8 +34294,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-6303",
-   "self_type" : "type-6302",
+   "referenced_type" : "type-6229",
+   "self_type" : "type-6228",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34307,8 +34304,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-6436",
-   "self_type" : "type-6435",
+   "referenced_type" : "type-6466",
+   "self_type" : "type-6465",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34317,8 +34314,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-6701",
-   "self_type" : "type-6700",
+   "referenced_type" : "type-7026",
+   "self_type" : "type-7025",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34327,8 +34324,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-7173",
-   "self_type" : "type-7172",
+   "referenced_type" : "type-7274",
+   "self_type" : "type-7273",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34337,8 +34334,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-7376",
-   "self_type" : "type-7375",
+   "referenced_type" : "type-7407",
+   "self_type" : "type-7406",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34347,8 +34344,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::SlotIndex, 2>",
-   "referenced_type" : "type-7519",
-   "self_type" : "type-7518",
+   "referenced_type" : "type-7542",
+   "self_type" : "type-7541",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34377,8 +34374,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-3400",
+   "self_type" : "type-3399",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34387,8 +34384,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-2466",
-   "self_type" : "type-2465",
+   "referenced_type" : "type-3566",
+   "self_type" : "type-3565",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34397,8 +34394,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-2769",
-   "self_type" : "type-2768",
+   "referenced_type" : "type-3869",
+   "self_type" : "type-3868",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34407,8 +34404,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-3761",
-   "self_type" : "type-3760",
+   "referenced_type" : "type-4420",
+   "self_type" : "type-4419",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34417,8 +34414,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-3969",
-   "self_type" : "type-3968",
+   "referenced_type" : "type-4629",
+   "self_type" : "type-4628",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34427,8 +34424,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-4137",
-   "self_type" : "type-4136",
+   "referenced_type" : "type-4799",
+   "self_type" : "type-4798",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34437,8 +34434,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-4824",
-   "self_type" : "type-4823",
+   "referenced_type" : "type-5103",
+   "self_type" : "type-5102",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34447,8 +34444,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-5045",
-   "self_type" : "type-5044",
+   "referenced_type" : "type-5206",
+   "self_type" : "type-5205",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34457,8 +34454,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-5171",
-   "self_type" : "type-5170",
+   "referenced_type" : "type-5475",
+   "self_type" : "type-5474",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34467,8 +34464,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-5373",
-   "self_type" : "type-5372",
+   "referenced_type" : "type-5641",
+   "self_type" : "type-5640",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34477,8 +34474,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-5539",
-   "self_type" : "type-5538",
+   "referenced_type" : "type-5944",
+   "self_type" : "type-5943",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34487,8 +34484,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-5842",
-   "self_type" : "type-5841",
+   "referenced_type" : "type-6095",
+   "self_type" : "type-6094",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34507,8 +34504,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-6300",
-   "self_type" : "type-6299",
+   "referenced_type" : "type-6227",
+   "self_type" : "type-6226",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34517,8 +34514,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-6434",
-   "self_type" : "type-6433",
+   "referenced_type" : "type-6464",
+   "self_type" : "type-6463",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34527,8 +34524,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-6699",
-   "self_type" : "type-6698",
+   "referenced_type" : "type-7024",
+   "self_type" : "type-7023",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34537,8 +34534,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-7170",
-   "self_type" : "type-7169",
+   "referenced_type" : "type-7272",
+   "self_type" : "type-7271",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34547,8 +34544,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-7374",
-   "self_type" : "type-7373",
+   "referenced_type" : "type-7405",
+   "self_type" : "type-7404",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34557,8 +34554,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
    "name" : "const std::array<android::hardware::graphics::bufferqueue::V2_0::Status, 9>",
-   "referenced_type" : "type-7516",
-   "self_type" : "type-7515",
+   "referenced_type" : "type-7540",
+   "self_type" : "type-7539",
    "size" : 36,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/2.0/android.hardware.graphics.bufferqueue@2.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/2.0/types.h"
   },
@@ -34597,8 +34594,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-2271",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-3371",
+   "self_type" : "type-3370",
    "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"
   },
@@ -34607,8 +34604,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-2448",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-3548",
+   "self_type" : "type-3547",
    "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"
   },
@@ -34617,8 +34614,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-2624",
-   "self_type" : "type-2623",
+   "referenced_type" : "type-3724",
+   "self_type" : "type-3723",
    "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"
   },
@@ -34627,8 +34624,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-2749",
-   "self_type" : "type-2748",
+   "referenced_type" : "type-3849",
+   "self_type" : "type-3848",
    "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"
   },
@@ -34637,8 +34634,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-3743",
-   "self_type" : "type-3742",
+   "referenced_type" : "type-4402",
+   "self_type" : "type-4401",
    "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"
   },
@@ -34647,8 +34644,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-3950",
-   "self_type" : "type-3949",
+   "referenced_type" : "type-4610",
+   "self_type" : "type-4609",
    "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"
   },
@@ -34657,8 +34654,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-4120",
-   "self_type" : "type-4119",
+   "referenced_type" : "type-4782",
+   "self_type" : "type-4781",
    "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"
   },
@@ -34667,8 +34664,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-4832",
-   "self_type" : "type-4831",
+   "referenced_type" : "type-5188",
+   "self_type" : "type-5187",
    "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"
   },
@@ -34677,38 +34674,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-4976",
-   "self_type" : "type-4975",
-   "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-5153",
-   "self_type" : "type-5152",
-   "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-5344",
-   "self_type" : "type-5343",
-   "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-5521",
-   "self_type" : "type-5520",
+   "referenced_type" : "type-5446",
+   "self_type" : "type-5445",
    "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"
   },
@@ -34727,8 +34694,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-5697",
-   "self_type" : "type-5696",
+   "referenced_type" : "type-5623",
+   "self_type" : "type-5622",
    "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"
   },
@@ -34737,8 +34704,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-5822",
-   "self_type" : "type-5821",
+   "referenced_type" : "type-5799",
+   "self_type" : "type-5798",
    "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"
   },
@@ -34747,8 +34714,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-6284",
-   "self_type" : "type-6283",
+   "referenced_type" : "type-5924",
+   "self_type" : "type-5923",
    "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"
   },
@@ -34757,8 +34724,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-6416",
-   "self_type" : "type-6415",
+   "referenced_type" : "type-6077",
+   "self_type" : "type-6076",
    "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"
   },
@@ -34767,8 +34734,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-6571",
-   "self_type" : "type-6570",
+   "referenced_type" : "type-6209",
+   "self_type" : "type-6208",
    "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"
   },
@@ -34777,8 +34744,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-6679",
-   "self_type" : "type-6678",
+   "referenced_type" : "type-6354",
+   "self_type" : "type-6353",
    "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"
   },
@@ -34787,8 +34754,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-7150",
-   "self_type" : "type-7149",
+   "referenced_type" : "type-6444",
+   "self_type" : "type-6443",
    "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"
   },
@@ -34797,8 +34764,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-7355",
-   "self_type" : "type-7354",
+   "referenced_type" : "type-7004",
+   "self_type" : "type-7003",
    "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"
   },
@@ -34807,8 +34774,38 @@
    "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-7500",
-   "self_type" : "type-7499",
+   "referenced_type" : "type-7250",
+   "self_type" : "type-7249",
+   "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-7389",
+   "self_type" : "type-7388",
+   "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-7548",
+   "self_type" : "type-7547",
+   "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-7692",
+   "self_type" : "type-7691",
    "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"
   },
@@ -34847,8 +34844,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-2277",
-   "self_type" : "type-2276",
+   "referenced_type" : "type-3377",
+   "self_type" : "type-3376",
    "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"
   },
@@ -34857,8 +34854,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-2454",
-   "self_type" : "type-2453",
+   "referenced_type" : "type-3554",
+   "self_type" : "type-3553",
    "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"
   },
@@ -34867,8 +34864,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-2631",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-3731",
+   "self_type" : "type-3730",
    "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"
   },
@@ -34877,8 +34874,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-2755",
-   "self_type" : "type-2754",
+   "referenced_type" : "type-3855",
+   "self_type" : "type-3854",
    "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"
   },
@@ -34887,8 +34884,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-3749",
-   "self_type" : "type-3748",
+   "referenced_type" : "type-4408",
+   "self_type" : "type-4407",
    "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"
   },
@@ -34897,8 +34894,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-3956",
-   "self_type" : "type-3955",
+   "referenced_type" : "type-4616",
+   "self_type" : "type-4615",
    "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"
   },
@@ -34907,8 +34904,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-4127",
-   "self_type" : "type-4126",
+   "referenced_type" : "type-4789",
+   "self_type" : "type-4788",
    "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"
   },
@@ -34917,8 +34914,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-4838",
-   "self_type" : "type-4837",
+   "referenced_type" : "type-5194",
+   "self_type" : "type-5193",
    "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"
   },
@@ -34927,38 +34924,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-4983",
-   "self_type" : "type-4982",
-   "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-5160",
-   "self_type" : "type-5159",
-   "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-5350",
-   "self_type" : "type-5349",
-   "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-5527",
-   "self_type" : "type-5526",
+   "referenced_type" : "type-5452",
+   "self_type" : "type-5451",
    "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"
   },
@@ -34977,8 +34944,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-5704",
-   "self_type" : "type-5703",
+   "referenced_type" : "type-5629",
+   "self_type" : "type-5628",
    "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"
   },
@@ -34987,8 +34954,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-5828",
-   "self_type" : "type-5827",
+   "referenced_type" : "type-5806",
+   "self_type" : "type-5805",
    "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"
   },
@@ -34997,8 +34964,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-6290",
-   "self_type" : "type-6289",
+   "referenced_type" : "type-5930",
+   "self_type" : "type-5929",
    "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"
   },
@@ -35007,8 +34974,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-6422",
-   "self_type" : "type-6421",
+   "referenced_type" : "type-6083",
+   "self_type" : "type-6082",
    "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"
   },
@@ -35017,8 +34984,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-6577",
-   "self_type" : "type-6576",
+   "referenced_type" : "type-6215",
+   "self_type" : "type-6214",
    "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"
   },
@@ -35027,8 +34994,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-6685",
-   "self_type" : "type-6684",
+   "referenced_type" : "type-6361",
+   "self_type" : "type-6360",
    "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"
   },
@@ -35037,8 +35004,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-7156",
-   "self_type" : "type-7155",
+   "referenced_type" : "type-6450",
+   "self_type" : "type-6449",
    "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"
   },
@@ -35047,8 +35014,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-7361",
-   "self_type" : "type-7360",
+   "referenced_type" : "type-7011",
+   "self_type" : "type-7010",
    "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"
   },
@@ -35057,8 +35024,38 @@
    "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-7506",
-   "self_type" : "type-7505",
+   "referenced_type" : "type-7256",
+   "self_type" : "type-7255",
+   "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-7395",
+   "self_type" : "type-7394",
+   "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-7554",
+   "self_type" : "type-7553",
+   "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-7698",
+   "self_type" : "type-7697",
    "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"
   },
@@ -35097,8 +35094,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-2280",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-3380",
+   "self_type" : "type-3379",
    "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"
   },
@@ -35107,8 +35104,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-2456",
-   "self_type" : "type-2455",
+   "referenced_type" : "type-3556",
+   "self_type" : "type-3555",
    "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"
   },
@@ -35117,8 +35114,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-2633",
-   "self_type" : "type-2632",
+   "referenced_type" : "type-3733",
+   "self_type" : "type-3732",
    "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"
   },
@@ -35127,8 +35124,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-2757",
-   "self_type" : "type-2756",
+   "referenced_type" : "type-3857",
+   "self_type" : "type-3856",
    "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"
   },
@@ -35137,8 +35134,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-3751",
-   "self_type" : "type-3750",
+   "referenced_type" : "type-4410",
+   "self_type" : "type-4409",
    "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"
   },
@@ -35147,8 +35144,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-3958",
-   "self_type" : "type-3957",
+   "referenced_type" : "type-4618",
+   "self_type" : "type-4617",
    "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"
   },
@@ -35157,8 +35154,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-4129",
-   "self_type" : "type-4128",
+   "referenced_type" : "type-4791",
+   "self_type" : "type-4790",
    "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"
   },
@@ -35167,8 +35164,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-4840",
-   "self_type" : "type-4839",
+   "referenced_type" : "type-5196",
+   "self_type" : "type-5195",
    "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"
   },
@@ -35177,38 +35174,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-4985",
-   "self_type" : "type-4984",
-   "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-5162",
-   "self_type" : "type-5161",
-   "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-5353",
-   "self_type" : "type-5352",
-   "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-5529",
-   "self_type" : "type-5528",
+   "referenced_type" : "type-5455",
+   "self_type" : "type-5454",
    "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"
   },
@@ -35227,8 +35194,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-5706",
-   "self_type" : "type-5705",
+   "referenced_type" : "type-5631",
+   "self_type" : "type-5630",
    "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"
   },
@@ -35237,8 +35204,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-5830",
-   "self_type" : "type-5829",
+   "referenced_type" : "type-5808",
+   "self_type" : "type-5807",
    "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"
   },
@@ -35247,8 +35214,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-6292",
-   "self_type" : "type-6291",
+   "referenced_type" : "type-5932",
+   "self_type" : "type-5931",
    "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"
   },
@@ -35257,8 +35224,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-6424",
-   "self_type" : "type-6423",
+   "referenced_type" : "type-6085",
+   "self_type" : "type-6084",
    "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"
   },
@@ -35267,8 +35234,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-6580",
-   "self_type" : "type-6579",
+   "referenced_type" : "type-6217",
+   "self_type" : "type-6216",
    "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"
   },
@@ -35277,8 +35244,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-6687",
-   "self_type" : "type-6686",
+   "referenced_type" : "type-6363",
+   "self_type" : "type-6362",
    "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"
   },
@@ -35287,8 +35254,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-7158",
-   "self_type" : "type-7157",
+   "referenced_type" : "type-6452",
+   "self_type" : "type-6451",
    "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"
   },
@@ -35297,8 +35264,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-7363",
-   "self_type" : "type-7362",
+   "referenced_type" : "type-7013",
+   "self_type" : "type-7012",
    "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"
   },
@@ -35307,8 +35274,38 @@
    "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-7508",
-   "self_type" : "type-7507",
+   "referenced_type" : "type-7258",
+   "self_type" : "type-7257",
+   "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-7397",
+   "self_type" : "type-7396",
+   "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-7556",
+   "self_type" : "type-7555",
+   "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-7700",
+   "self_type" : "type-7699",
    "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"
   },
@@ -35347,8 +35344,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-2275",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-3375",
+   "self_type" : "type-3374",
    "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"
   },
@@ -35357,8 +35354,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-2452",
-   "self_type" : "type-2451",
+   "referenced_type" : "type-3552",
+   "self_type" : "type-3551",
    "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"
   },
@@ -35367,8 +35364,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-2628",
-   "self_type" : "type-2627",
+   "referenced_type" : "type-3728",
+   "self_type" : "type-3727",
    "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"
   },
@@ -35377,8 +35374,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-2753",
-   "self_type" : "type-2752",
+   "referenced_type" : "type-3853",
+   "self_type" : "type-3852",
    "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"
   },
@@ -35387,8 +35384,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-3747",
-   "self_type" : "type-3746",
+   "referenced_type" : "type-4406",
+   "self_type" : "type-4405",
    "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"
   },
@@ -35397,8 +35394,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-3954",
-   "self_type" : "type-3953",
+   "referenced_type" : "type-4614",
+   "self_type" : "type-4613",
    "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"
   },
@@ -35407,8 +35404,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-4125",
-   "self_type" : "type-4124",
+   "referenced_type" : "type-4787",
+   "self_type" : "type-4786",
    "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"
   },
@@ -35417,8 +35414,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-4836",
-   "self_type" : "type-4835",
+   "referenced_type" : "type-5192",
+   "self_type" : "type-5191",
    "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"
   },
@@ -35427,38 +35424,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-4980",
-   "self_type" : "type-4979",
-   "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-5157",
-   "self_type" : "type-5156",
-   "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-5348",
-   "self_type" : "type-5347",
-   "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-5525",
-   "self_type" : "type-5524",
+   "referenced_type" : "type-5450",
+   "self_type" : "type-5449",
    "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"
   },
@@ -35477,8 +35444,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-5701",
-   "self_type" : "type-5700",
+   "referenced_type" : "type-5627",
+   "self_type" : "type-5626",
    "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"
   },
@@ -35487,8 +35454,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-5826",
-   "self_type" : "type-5825",
+   "referenced_type" : "type-5803",
+   "self_type" : "type-5802",
    "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"
   },
@@ -35497,8 +35464,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-6288",
-   "self_type" : "type-6287",
+   "referenced_type" : "type-5928",
+   "self_type" : "type-5927",
    "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"
   },
@@ -35507,8 +35474,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-6420",
-   "self_type" : "type-6419",
+   "referenced_type" : "type-6081",
+   "self_type" : "type-6080",
    "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"
   },
@@ -35517,8 +35484,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-6575",
-   "self_type" : "type-6574",
+   "referenced_type" : "type-6213",
+   "self_type" : "type-6212",
    "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"
   },
@@ -35527,8 +35494,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-6683",
-   "self_type" : "type-6682",
+   "referenced_type" : "type-6359",
+   "self_type" : "type-6358",
    "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"
   },
@@ -35537,8 +35504,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-7154",
-   "self_type" : "type-7153",
+   "referenced_type" : "type-6448",
+   "self_type" : "type-6447",
    "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"
   },
@@ -35547,8 +35514,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-7359",
-   "self_type" : "type-7358",
+   "referenced_type" : "type-7008",
+   "self_type" : "type-7007",
    "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"
   },
@@ -35557,8 +35524,38 @@
    "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-7504",
-   "self_type" : "type-7503",
+   "referenced_type" : "type-7254",
+   "self_type" : "type-7253",
+   "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-7393",
+   "self_type" : "type-7392",
+   "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-7552",
+   "self_type" : "type-7551",
+   "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-7696",
+   "self_type" : "type-7695",
    "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"
   },
@@ -35597,8 +35594,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-2283",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-3383",
+   "self_type" : "type-3382",
    "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"
   },
@@ -35607,8 +35604,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-2458",
-   "self_type" : "type-2457",
+   "referenced_type" : "type-3558",
+   "self_type" : "type-3557",
    "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"
   },
@@ -35617,8 +35614,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-2635",
-   "self_type" : "type-2634",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
    "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"
   },
@@ -35627,8 +35624,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-2759",
-   "self_type" : "type-2758",
+   "referenced_type" : "type-3859",
+   "self_type" : "type-3858",
    "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"
   },
@@ -35637,8 +35634,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-3753",
-   "self_type" : "type-3752",
+   "referenced_type" : "type-4412",
+   "self_type" : "type-4411",
    "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"
   },
@@ -35647,8 +35644,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-3960",
-   "self_type" : "type-3959",
+   "referenced_type" : "type-4620",
+   "self_type" : "type-4619",
    "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"
   },
@@ -35657,8 +35654,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-4131",
-   "self_type" : "type-4130",
+   "referenced_type" : "type-4793",
+   "self_type" : "type-4792",
    "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"
   },
@@ -35667,8 +35664,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-4842",
-   "self_type" : "type-4841",
+   "referenced_type" : "type-5199",
+   "self_type" : "type-5198",
    "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"
   },
@@ -35677,8 +35674,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-4987",
-   "self_type" : "type-4986",
+   "referenced_type" : "type-5458",
+   "self_type" : "type-5457",
    "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"
   },
@@ -35687,8 +35684,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-5164",
-   "self_type" : "type-5163",
+   "referenced_type" : "type-5633",
+   "self_type" : "type-5632",
    "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"
   },
@@ -35697,38 +35694,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-5356",
-   "self_type" : "type-5355",
-   "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-5531",
-   "self_type" : "type-5530",
-   "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-5708",
-   "self_type" : "type-5707",
-   "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-5832",
-   "self_type" : "type-5831",
+   "referenced_type" : "type-5810",
+   "self_type" : "type-5809",
    "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"
   },
@@ -35747,8 +35714,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-6294",
-   "self_type" : "type-6293",
+   "referenced_type" : "type-5934",
+   "self_type" : "type-5933",
    "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"
   },
@@ -35757,8 +35724,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-6426",
-   "self_type" : "type-6425",
+   "referenced_type" : "type-6087",
+   "self_type" : "type-6086",
    "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"
   },
@@ -35767,8 +35734,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-6582",
-   "self_type" : "type-6581",
+   "referenced_type" : "type-6219",
+   "self_type" : "type-6218",
    "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"
   },
@@ -35777,8 +35744,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-6689",
-   "self_type" : "type-6688",
+   "referenced_type" : "type-6365",
+   "self_type" : "type-6364",
    "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"
   },
@@ -35787,8 +35754,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-7160",
-   "self_type" : "type-7159",
+   "referenced_type" : "type-6454",
+   "self_type" : "type-6453",
    "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"
   },
@@ -35797,8 +35764,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-7365",
-   "self_type" : "type-7364",
+   "referenced_type" : "type-7015",
+   "self_type" : "type-7014",
    "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"
   },
@@ -35807,8 +35774,38 @@
    "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-7510",
-   "self_type" : "type-7509",
+   "referenced_type" : "type-7260",
+   "self_type" : "type-7259",
+   "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-7399",
+   "self_type" : "type-7398",
+   "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-7558",
+   "self_type" : "type-7557",
+   "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-7703",
+   "self_type" : "type-7702",
    "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"
   },
@@ -35847,8 +35844,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-2269",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-3369",
+   "self_type" : "type-3368",
    "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"
   },
@@ -35857,8 +35854,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-2446",
-   "self_type" : "type-2445",
+   "referenced_type" : "type-3546",
+   "self_type" : "type-3545",
    "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"
   },
@@ -35867,8 +35864,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-2622",
-   "self_type" : "type-2621",
+   "referenced_type" : "type-3722",
+   "self_type" : "type-3721",
    "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"
   },
@@ -35877,8 +35874,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-2747",
-   "self_type" : "type-2746",
+   "referenced_type" : "type-3847",
+   "self_type" : "type-3846",
    "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"
   },
@@ -35887,8 +35884,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-3741",
-   "self_type" : "type-3740",
+   "referenced_type" : "type-4400",
+   "self_type" : "type-4399",
    "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"
   },
@@ -35897,8 +35894,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-3948",
-   "self_type" : "type-3947",
+   "referenced_type" : "type-4608",
+   "self_type" : "type-4607",
    "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"
   },
@@ -35907,8 +35904,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-4118",
-   "self_type" : "type-4117",
+   "referenced_type" : "type-4780",
+   "self_type" : "type-4779",
    "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"
   },
@@ -35917,8 +35914,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-4830",
-   "self_type" : "type-4829",
+   "referenced_type" : "type-5185",
+   "self_type" : "type-5184",
    "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"
   },
@@ -35927,38 +35924,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-4974",
-   "self_type" : "type-4973",
-   "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-5151",
-   "self_type" : "type-5150",
-   "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-5342",
-   "self_type" : "type-5341",
-   "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-5519",
-   "self_type" : "type-5518",
+   "referenced_type" : "type-5444",
+   "self_type" : "type-5443",
    "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"
   },
@@ -35977,8 +35944,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-5695",
-   "self_type" : "type-5694",
+   "referenced_type" : "type-5621",
+   "self_type" : "type-5620",
    "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"
   },
@@ -35987,8 +35954,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-5820",
-   "self_type" : "type-5819",
+   "referenced_type" : "type-5797",
+   "self_type" : "type-5796",
    "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"
   },
@@ -35997,8 +35964,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-6282",
-   "self_type" : "type-6281",
+   "referenced_type" : "type-5922",
+   "self_type" : "type-5921",
    "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"
   },
@@ -36007,8 +35974,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-6413",
-   "self_type" : "type-6412",
+   "referenced_type" : "type-6075",
+   "self_type" : "type-6074",
    "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"
   },
@@ -36017,8 +35984,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-6569",
-   "self_type" : "type-6568",
+   "referenced_type" : "type-6207",
+   "self_type" : "type-6206",
    "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"
   },
@@ -36027,8 +35994,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-6677",
-   "self_type" : "type-6676",
+   "referenced_type" : "type-6352",
+   "self_type" : "type-6351",
    "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"
   },
@@ -36037,8 +36004,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-7148",
-   "self_type" : "type-7147",
+   "referenced_type" : "type-6442",
+   "self_type" : "type-6441",
    "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"
   },
@@ -36047,8 +36014,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-7353",
-   "self_type" : "type-7352",
+   "referenced_type" : "type-7002",
+   "self_type" : "type-7001",
    "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"
   },
@@ -36057,8 +36024,38 @@
    "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-7498",
-   "self_type" : "type-7497",
+   "referenced_type" : "type-7248",
+   "self_type" : "type-7247",
+   "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-7387",
+   "self_type" : "type-7386",
+   "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-7546",
+   "self_type" : "type-7545",
+   "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-7689",
+   "self_type" : "type-7688",
    "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"
   },
@@ -36097,8 +36094,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-2273",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-3373",
+   "self_type" : "type-3372",
    "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"
   },
@@ -36107,8 +36104,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-2450",
-   "self_type" : "type-2449",
+   "referenced_type" : "type-3550",
+   "self_type" : "type-3549",
    "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"
   },
@@ -36117,8 +36114,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-2626",
-   "self_type" : "type-2625",
+   "referenced_type" : "type-3726",
+   "self_type" : "type-3725",
    "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"
   },
@@ -36127,8 +36124,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-2751",
-   "self_type" : "type-2750",
+   "referenced_type" : "type-3851",
+   "self_type" : "type-3850",
    "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"
   },
@@ -36137,8 +36134,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-3745",
-   "self_type" : "type-3744",
+   "referenced_type" : "type-4404",
+   "self_type" : "type-4403",
    "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"
   },
@@ -36147,8 +36144,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-3952",
-   "self_type" : "type-3951",
+   "referenced_type" : "type-4612",
+   "self_type" : "type-4611",
    "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"
   },
@@ -36157,8 +36154,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-4122",
-   "self_type" : "type-4121",
+   "referenced_type" : "type-4784",
+   "self_type" : "type-4783",
    "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"
   },
@@ -36167,8 +36164,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-4834",
-   "self_type" : "type-4833",
+   "referenced_type" : "type-5190",
+   "self_type" : "type-5189",
    "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"
   },
@@ -36177,38 +36174,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-4978",
-   "self_type" : "type-4977",
-   "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-5155",
-   "self_type" : "type-5154",
-   "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-5346",
-   "self_type" : "type-5345",
-   "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-5523",
-   "self_type" : "type-5522",
+   "referenced_type" : "type-5448",
+   "self_type" : "type-5447",
    "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"
   },
@@ -36227,8 +36194,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-5699",
-   "self_type" : "type-5698",
+   "referenced_type" : "type-5625",
+   "self_type" : "type-5624",
    "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"
   },
@@ -36237,8 +36204,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-5824",
-   "self_type" : "type-5823",
+   "referenced_type" : "type-5801",
+   "self_type" : "type-5800",
    "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"
   },
@@ -36247,8 +36214,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-6286",
-   "self_type" : "type-6285",
+   "referenced_type" : "type-5926",
+   "self_type" : "type-5925",
    "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"
   },
@@ -36257,8 +36224,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-6418",
-   "self_type" : "type-6417",
+   "referenced_type" : "type-6079",
+   "self_type" : "type-6078",
    "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"
   },
@@ -36267,8 +36234,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-6573",
-   "self_type" : "type-6572",
+   "referenced_type" : "type-6211",
+   "self_type" : "type-6210",
    "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"
   },
@@ -36277,8 +36244,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-6681",
-   "self_type" : "type-6680",
+   "referenced_type" : "type-6357",
+   "self_type" : "type-6356",
    "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"
   },
@@ -36287,8 +36254,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-7152",
-   "self_type" : "type-7151",
+   "referenced_type" : "type-6446",
+   "self_type" : "type-6445",
    "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"
   },
@@ -36297,8 +36264,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-7357",
-   "self_type" : "type-7356",
+   "referenced_type" : "type-7006",
+   "self_type" : "type-7005",
    "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"
   },
@@ -36307,8 +36274,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-7502",
-   "self_type" : "type-7501",
+   "referenced_type" : "type-7252",
+   "self_type" : "type-7251",
+   "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-7391",
+   "self_type" : "type-7390",
+   "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-7550",
+   "self_type" : "type-7549",
+   "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-7694",
+   "self_type" : "type-7693",
    "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"
   },
@@ -36347,8 +36344,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-2314",
-   "self_type" : "type-2313",
+   "referenced_type" : "type-3414",
+   "self_type" : "type-3413",
    "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"
   },
@@ -36357,8 +36354,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-2475",
-   "self_type" : "type-2474",
+   "referenced_type" : "type-3575",
+   "self_type" : "type-3574",
    "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"
   },
@@ -36367,8 +36364,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-2639",
-   "self_type" : "type-2638",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
    "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"
   },
@@ -36377,8 +36374,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-2778",
-   "self_type" : "type-2777",
+   "referenced_type" : "type-3878",
+   "self_type" : "type-3877",
    "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"
   },
@@ -36387,8 +36384,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-3771",
-   "self_type" : "type-3770",
+   "referenced_type" : "type-4430",
+   "self_type" : "type-4429",
    "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"
   },
@@ -36397,8 +36394,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-3977",
-   "self_type" : "type-3976",
+   "referenced_type" : "type-4637",
+   "self_type" : "type-4636",
    "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"
   },
@@ -36407,8 +36404,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-4145",
-   "self_type" : "type-4144",
+   "referenced_type" : "type-4807",
+   "self_type" : "type-4806",
    "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"
   },
@@ -36417,8 +36414,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-4846",
-   "self_type" : "type-4845",
+   "referenced_type" : "type-5215",
+   "self_type" : "type-5214",
    "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"
   },
@@ -36427,8 +36424,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-4992",
-   "self_type" : "type-4991",
+   "referenced_type" : "type-5489",
+   "self_type" : "type-5488",
    "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"
   },
@@ -36437,8 +36434,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-5181",
-   "self_type" : "type-5180",
+   "referenced_type" : "type-5650",
+   "self_type" : "type-5649",
    "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"
   },
@@ -36447,8 +36444,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-5387",
-   "self_type" : "type-5386",
+   "referenced_type" : "type-5814",
+   "self_type" : "type-5813",
    "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"
   },
@@ -36457,8 +36454,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-5548",
-   "self_type" : "type-5547",
+   "referenced_type" : "type-5953",
+   "self_type" : "type-5952",
    "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"
   },
@@ -36467,8 +36464,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-5712",
-   "self_type" : "type-5711",
+   "referenced_type" : "type-6103",
+   "self_type" : "type-6102",
    "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"
   },
@@ -36477,8 +36474,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-5851",
-   "self_type" : "type-5850",
+   "referenced_type" : "type-6236",
+   "self_type" : "type-6235",
    "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"
   },
@@ -36487,8 +36484,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-6309",
-   "self_type" : "type-6308",
+   "referenced_type" : "type-6369",
+   "self_type" : "type-6368",
    "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"
   },
@@ -36507,8 +36504,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-6442",
-   "self_type" : "type-6441",
+   "referenced_type" : "type-6472",
+   "self_type" : "type-6471",
    "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"
   },
@@ -36517,8 +36514,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-6586",
-   "self_type" : "type-6585",
+   "referenced_type" : "type-7035",
+   "self_type" : "type-7034",
    "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"
   },
@@ -36527,8 +36524,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-6707",
-   "self_type" : "type-6706",
+   "referenced_type" : "type-7280",
+   "self_type" : "type-7279",
    "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"
   },
@@ -36537,8 +36534,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-7182",
-   "self_type" : "type-7181",
+   "referenced_type" : "type-7413",
+   "self_type" : "type-7412",
    "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"
   },
@@ -36547,8 +36544,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-7383",
-   "self_type" : "type-7382",
+   "referenced_type" : "type-7562",
+   "self_type" : "type-7561",
    "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"
   },
@@ -36557,8 +36554,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-7526",
-   "self_type" : "type-7525",
+   "referenced_type" : "type-7707",
+   "self_type" : "type-7706",
    "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"
   },
@@ -36597,8 +36594,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-2318",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-3418",
+   "self_type" : "type-3417",
    "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"
   },
@@ -36607,8 +36604,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-2479",
-   "self_type" : "type-2478",
+   "referenced_type" : "type-3579",
+   "self_type" : "type-3578",
    "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"
   },
@@ -36617,8 +36614,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-2643",
-   "self_type" : "type-2642",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
    "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"
   },
@@ -36627,8 +36624,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-2782",
-   "self_type" : "type-2781",
+   "referenced_type" : "type-3882",
+   "self_type" : "type-3881",
    "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"
   },
@@ -36637,8 +36634,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-3776",
-   "self_type" : "type-3775",
+   "referenced_type" : "type-4435",
+   "self_type" : "type-4434",
    "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"
   },
@@ -36647,8 +36644,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-3981",
-   "self_type" : "type-3980",
+   "referenced_type" : "type-4641",
+   "self_type" : "type-4640",
    "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"
   },
@@ -36657,8 +36654,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-4150",
-   "self_type" : "type-4149",
+   "referenced_type" : "type-4812",
+   "self_type" : "type-4811",
    "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"
   },
@@ -36667,8 +36664,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-4850",
-   "self_type" : "type-4849",
+   "referenced_type" : "type-5219",
+   "self_type" : "type-5218",
    "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"
   },
@@ -36677,8 +36674,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-4996",
-   "self_type" : "type-4995",
+   "referenced_type" : "type-5493",
+   "self_type" : "type-5492",
    "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"
   },
@@ -36687,8 +36684,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-5185",
-   "self_type" : "type-5184",
+   "referenced_type" : "type-5654",
+   "self_type" : "type-5653",
    "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"
   },
@@ -36697,8 +36694,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-5391",
-   "self_type" : "type-5390",
+   "referenced_type" : "type-5818",
+   "self_type" : "type-5817",
    "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"
   },
@@ -36707,8 +36704,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-5552",
-   "self_type" : "type-5551",
+   "referenced_type" : "type-5957",
+   "self_type" : "type-5956",
    "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"
   },
@@ -36717,8 +36714,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-5716",
-   "self_type" : "type-5715",
+   "referenced_type" : "type-6108",
+   "self_type" : "type-6107",
    "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"
   },
@@ -36727,8 +36724,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-5855",
-   "self_type" : "type-5854",
+   "referenced_type" : "type-6240",
+   "self_type" : "type-6239",
    "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"
   },
@@ -36737,18 +36734,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-6313",
-   "self_type" : "type-6312",
-   "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-6446",
-   "self_type" : "type-6445",
+   "referenced_type" : "type-6373",
+   "self_type" : "type-6372",
    "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"
   },
@@ -36767,8 +36754,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-6590",
-   "self_type" : "type-6589",
+   "referenced_type" : "type-6476",
+   "self_type" : "type-6475",
    "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"
   },
@@ -36777,8 +36764,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-6711",
-   "self_type" : "type-6710",
+   "referenced_type" : "type-7040",
+   "self_type" : "type-7039",
    "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"
   },
@@ -36787,8 +36774,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-7187",
-   "self_type" : "type-7186",
+   "referenced_type" : "type-7285",
+   "self_type" : "type-7284",
    "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"
   },
@@ -36797,8 +36784,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-7387",
-   "self_type" : "type-7386",
+   "referenced_type" : "type-7417",
+   "self_type" : "type-7416",
    "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"
   },
@@ -36807,8 +36794,18 @@
    "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-7530",
-   "self_type" : "type-7529",
+   "referenced_type" : "type-7566",
+   "self_type" : "type-7565",
+   "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-7711",
+   "self_type" : "type-7710",
    "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"
   },
@@ -36847,8 +36844,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-2316",
-   "self_type" : "type-2315",
+   "referenced_type" : "type-3416",
+   "self_type" : "type-3415",
    "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"
   },
@@ -36857,8 +36854,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-2477",
-   "self_type" : "type-2476",
+   "referenced_type" : "type-3577",
+   "self_type" : "type-3576",
    "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"
   },
@@ -36867,8 +36864,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-2641",
-   "self_type" : "type-2640",
+   "referenced_type" : "type-3741",
+   "self_type" : "type-3740",
    "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"
   },
@@ -36877,8 +36874,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-2780",
-   "self_type" : "type-2779",
+   "referenced_type" : "type-3880",
+   "self_type" : "type-3879",
    "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"
   },
@@ -36887,8 +36884,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-3774",
-   "self_type" : "type-3773",
+   "referenced_type" : "type-4433",
+   "self_type" : "type-4432",
    "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"
   },
@@ -36897,8 +36894,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-3979",
-   "self_type" : "type-3978",
+   "referenced_type" : "type-4639",
+   "self_type" : "type-4638",
    "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"
   },
@@ -36907,8 +36904,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-4148",
-   "self_type" : "type-4147",
+   "referenced_type" : "type-4810",
+   "self_type" : "type-4809",
    "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"
   },
@@ -36917,8 +36914,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-4848",
-   "self_type" : "type-4847",
+   "referenced_type" : "type-5217",
+   "self_type" : "type-5216",
    "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"
   },
@@ -36927,8 +36924,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-4994",
-   "self_type" : "type-4993",
+   "referenced_type" : "type-5491",
+   "self_type" : "type-5490",
    "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"
   },
@@ -36937,8 +36934,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-5183",
-   "self_type" : "type-5182",
+   "referenced_type" : "type-5652",
+   "self_type" : "type-5651",
    "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"
   },
@@ -36947,8 +36944,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-5389",
-   "self_type" : "type-5388",
+   "referenced_type" : "type-5816",
+   "self_type" : "type-5815",
    "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"
   },
@@ -36957,8 +36954,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-5550",
-   "self_type" : "type-5549",
+   "referenced_type" : "type-5955",
+   "self_type" : "type-5954",
    "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"
   },
@@ -36967,8 +36964,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-5714",
-   "self_type" : "type-5713",
+   "referenced_type" : "type-6106",
+   "self_type" : "type-6105",
    "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"
   },
@@ -36977,8 +36974,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-5853",
-   "self_type" : "type-5852",
+   "referenced_type" : "type-6238",
+   "self_type" : "type-6237",
    "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"
   },
@@ -36987,8 +36984,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-6311",
-   "self_type" : "type-6310",
+   "referenced_type" : "type-6371",
+   "self_type" : "type-6370",
    "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"
   },
@@ -37007,8 +37004,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-6444",
-   "self_type" : "type-6443",
+   "referenced_type" : "type-6474",
+   "self_type" : "type-6473",
    "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"
   },
@@ -37017,8 +37014,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-6588",
-   "self_type" : "type-6587",
+   "referenced_type" : "type-7038",
+   "self_type" : "type-7037",
    "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"
   },
@@ -37027,8 +37024,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-6709",
-   "self_type" : "type-6708",
+   "referenced_type" : "type-7283",
+   "self_type" : "type-7282",
    "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"
   },
@@ -37037,8 +37034,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-7185",
-   "self_type" : "type-7184",
+   "referenced_type" : "type-7415",
+   "self_type" : "type-7414",
    "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"
   },
@@ -37047,8 +37044,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-7385",
-   "self_type" : "type-7384",
+   "referenced_type" : "type-7564",
+   "self_type" : "type-7563",
    "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"
   },
@@ -37057,8 +37054,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-7528",
-   "self_type" : "type-7527",
+   "referenced_type" : "type-7709",
+   "self_type" : "type-7708",
    "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"
   },
@@ -37097,8 +37094,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-2312",
-   "self_type" : "type-2311",
+   "referenced_type" : "type-3412",
+   "self_type" : "type-3411",
    "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"
   },
@@ -37107,8 +37104,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-2473",
-   "self_type" : "type-2472",
+   "referenced_type" : "type-3573",
+   "self_type" : "type-3572",
    "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"
   },
@@ -37117,8 +37114,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-2637",
-   "self_type" : "type-2636",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3736",
    "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"
   },
@@ -37127,8 +37124,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-2776",
-   "self_type" : "type-2775",
+   "referenced_type" : "type-3876",
+   "self_type" : "type-3875",
    "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"
   },
@@ -37137,8 +37134,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-3769",
-   "self_type" : "type-3768",
+   "referenced_type" : "type-4428",
+   "self_type" : "type-4427",
    "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"
   },
@@ -37147,8 +37144,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-3975",
-   "self_type" : "type-3974",
+   "referenced_type" : "type-4635",
+   "self_type" : "type-4634",
    "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"
   },
@@ -37157,8 +37154,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-4143",
-   "self_type" : "type-4142",
+   "referenced_type" : "type-4805",
+   "self_type" : "type-4804",
    "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"
   },
@@ -37167,8 +37164,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-4844",
-   "self_type" : "type-4843",
+   "referenced_type" : "type-5212",
+   "self_type" : "type-5211",
    "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"
   },
@@ -37177,8 +37174,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-4990",
-   "self_type" : "type-4989",
+   "referenced_type" : "type-5487",
+   "self_type" : "type-5486",
    "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"
   },
@@ -37187,8 +37184,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-5179",
-   "self_type" : "type-5178",
+   "referenced_type" : "type-5648",
+   "self_type" : "type-5647",
    "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"
   },
@@ -37197,8 +37194,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-5385",
-   "self_type" : "type-5384",
+   "referenced_type" : "type-5812",
+   "self_type" : "type-5811",
    "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"
   },
@@ -37207,8 +37204,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-5546",
-   "self_type" : "type-5545",
+   "referenced_type" : "type-5951",
+   "self_type" : "type-5950",
    "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"
   },
@@ -37217,8 +37214,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-5710",
-   "self_type" : "type-5709",
+   "referenced_type" : "type-6101",
+   "self_type" : "type-6100",
    "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"
   },
@@ -37227,8 +37224,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-5849",
-   "self_type" : "type-5848",
+   "referenced_type" : "type-6233",
+   "self_type" : "type-6232",
    "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"
   },
@@ -37237,8 +37234,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-6307",
-   "self_type" : "type-6306",
+   "referenced_type" : "type-6367",
+   "self_type" : "type-6366",
    "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"
   },
@@ -37257,8 +37254,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-6440",
-   "self_type" : "type-6439",
+   "referenced_type" : "type-6470",
+   "self_type" : "type-6469",
    "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"
   },
@@ -37267,8 +37264,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-6584",
-   "self_type" : "type-6583",
+   "referenced_type" : "type-7032",
+   "self_type" : "type-7031",
    "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"
   },
@@ -37277,8 +37274,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-6705",
-   "self_type" : "type-6704",
+   "referenced_type" : "type-7278",
+   "self_type" : "type-7277",
    "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"
   },
@@ -37287,8 +37284,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-7180",
-   "self_type" : "type-7179",
+   "referenced_type" : "type-7411",
+   "self_type" : "type-7410",
    "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"
   },
@@ -37297,8 +37294,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-7381",
-   "self_type" : "type-7380",
+   "referenced_type" : "type-7560",
+   "self_type" : "type-7559",
    "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"
   },
@@ -37307,8 +37304,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-7524",
-   "self_type" : "type-7523",
+   "referenced_type" : "type-7705",
+   "self_type" : "type-7704",
    "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"
   },
@@ -37347,8 +37344,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-2321",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-3421",
+   "self_type" : "type-3420",
    "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"
   },
@@ -37357,8 +37354,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-2481",
-   "self_type" : "type-2480",
+   "referenced_type" : "type-3581",
+   "self_type" : "type-3580",
    "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"
   },
@@ -37367,8 +37364,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-2645",
-   "self_type" : "type-2644",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
    "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"
   },
@@ -37377,8 +37374,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-2786",
-   "self_type" : "type-2785",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
    "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"
   },
@@ -37387,8 +37384,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-3778",
-   "self_type" : "type-3777",
+   "referenced_type" : "type-4437",
+   "self_type" : "type-4436",
    "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"
   },
@@ -37397,8 +37394,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-3983",
-   "self_type" : "type-3982",
+   "referenced_type" : "type-4643",
+   "self_type" : "type-4642",
    "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"
   },
@@ -37407,8 +37404,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-4152",
-   "self_type" : "type-4151",
+   "referenced_type" : "type-4814",
+   "self_type" : "type-4813",
    "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"
   },
@@ -37417,8 +37414,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-4852",
-   "self_type" : "type-4851",
+   "referenced_type" : "type-5221",
+   "self_type" : "type-5220",
    "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"
   },
@@ -37427,8 +37424,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-4998",
-   "self_type" : "type-4997",
+   "referenced_type" : "type-5496",
+   "self_type" : "type-5495",
    "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"
   },
@@ -37437,8 +37434,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-5188",
-   "self_type" : "type-5187",
+   "referenced_type" : "type-5656",
+   "self_type" : "type-5655",
    "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"
   },
@@ -37447,8 +37444,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-5394",
-   "self_type" : "type-5393",
+   "referenced_type" : "type-5820",
+   "self_type" : "type-5819",
    "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"
   },
@@ -37457,8 +37454,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-5554",
-   "self_type" : "type-5553",
+   "referenced_type" : "type-5961",
+   "self_type" : "type-5960",
    "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"
   },
@@ -37467,8 +37464,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-5718",
-   "self_type" : "type-5717",
+   "referenced_type" : "type-6110",
+   "self_type" : "type-6109",
    "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"
   },
@@ -37477,8 +37474,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-5859",
-   "self_type" : "type-5858",
+   "referenced_type" : "type-6242",
+   "self_type" : "type-6241",
    "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"
   },
@@ -37487,8 +37484,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-6315",
-   "self_type" : "type-6314",
+   "referenced_type" : "type-6375",
+   "self_type" : "type-6374",
    "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"
   },
@@ -37497,8 +37494,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-6448",
-   "self_type" : "type-6447",
+   "referenced_type" : "type-6480",
+   "self_type" : "type-6479",
    "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"
   },
@@ -37517,8 +37514,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-6592",
-   "self_type" : "type-6591",
+   "referenced_type" : "type-7042",
+   "self_type" : "type-7041",
    "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"
   },
@@ -37527,8 +37524,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-6715",
-   "self_type" : "type-6714",
+   "referenced_type" : "type-7287",
+   "self_type" : "type-7286",
    "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"
   },
@@ -37537,8 +37534,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-7190",
-   "self_type" : "type-7189",
+   "referenced_type" : "type-7419",
+   "self_type" : "type-7418",
    "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"
   },
@@ -37547,8 +37544,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-7389",
-   "self_type" : "type-7388",
+   "referenced_type" : "type-7568",
+   "self_type" : "type-7567",
    "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"
   },
@@ -37557,8 +37554,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-7532",
-   "self_type" : "type-7531",
+   "referenced_type" : "type-7713",
+   "self_type" : "type-7712",
    "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"
   },
@@ -37597,8 +37594,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-2334",
-   "self_type" : "type-2333",
+   "referenced_type" : "type-3434",
+   "self_type" : "type-3433",
    "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"
   },
@@ -37607,8 +37604,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-2491",
-   "self_type" : "type-2490",
+   "referenced_type" : "type-3591",
+   "self_type" : "type-3590",
    "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"
   },
@@ -37617,8 +37614,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-2655",
-   "self_type" : "type-2654",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
    "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"
   },
@@ -37627,8 +37624,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-2796",
-   "self_type" : "type-2795",
+   "referenced_type" : "type-3896",
+   "self_type" : "type-3895",
    "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"
   },
@@ -37637,8 +37634,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-3787",
-   "self_type" : "type-3786",
+   "referenced_type" : "type-4446",
+   "self_type" : "type-4445",
    "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"
   },
@@ -37647,8 +37644,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-3991",
-   "self_type" : "type-3990",
+   "referenced_type" : "type-4651",
+   "self_type" : "type-4650",
    "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"
   },
@@ -37657,8 +37654,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-4160",
-   "self_type" : "type-4159",
+   "referenced_type" : "type-4822",
+   "self_type" : "type-4821",
    "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"
   },
@@ -37667,8 +37664,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-4860",
-   "self_type" : "type-4859",
+   "referenced_type" : "type-5069",
+   "self_type" : "type-5068",
    "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"
   },
@@ -37677,8 +37674,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-5006",
-   "self_type" : "type-5005",
+   "referenced_type" : "type-5232",
+   "self_type" : "type-5231",
    "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"
   },
@@ -37687,8 +37684,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-5199",
-   "self_type" : "type-5198",
+   "referenced_type" : "type-5509",
+   "self_type" : "type-5508",
    "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"
   },
@@ -37697,8 +37694,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-5407",
-   "self_type" : "type-5406",
+   "referenced_type" : "type-5666",
+   "self_type" : "type-5665",
    "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"
   },
@@ -37707,8 +37704,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-5564",
-   "self_type" : "type-5563",
+   "referenced_type" : "type-5830",
+   "self_type" : "type-5829",
    "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"
   },
@@ -37717,8 +37714,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-5728",
-   "self_type" : "type-5727",
+   "referenced_type" : "type-5971",
+   "self_type" : "type-5970",
    "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"
   },
@@ -37727,8 +37724,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-5869",
-   "self_type" : "type-5868",
+   "referenced_type" : "type-6118",
+   "self_type" : "type-6117",
    "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"
   },
@@ -37737,8 +37734,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-6323",
-   "self_type" : "type-6322",
+   "referenced_type" : "type-6252",
+   "self_type" : "type-6251",
    "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"
   },
@@ -37747,8 +37744,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-6458",
-   "self_type" : "type-6457",
+   "referenced_type" : "type-6385",
+   "self_type" : "type-6384",
    "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"
   },
@@ -37757,8 +37754,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-6604",
-   "self_type" : "type-6603",
+   "referenced_type" : "type-6490",
+   "self_type" : "type-6489",
    "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"
   },
@@ -37777,8 +37774,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-6725",
-   "self_type" : "type-6724",
+   "referenced_type" : "type-7052",
+   "self_type" : "type-7051",
    "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"
   },
@@ -37787,8 +37784,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-7198",
-   "self_type" : "type-7197",
+   "referenced_type" : "type-7295",
+   "self_type" : "type-7294",
    "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"
   },
@@ -37797,8 +37794,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-7400",
-   "self_type" : "type-7399",
+   "referenced_type" : "type-7427",
+   "self_type" : "type-7426",
    "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"
   },
@@ -37807,8 +37804,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-7542",
-   "self_type" : "type-7541",
+   "referenced_type" : "type-7576",
+   "self_type" : "type-7575",
    "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"
   },
@@ -37847,8 +37844,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-2332",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-3432",
+   "self_type" : "type-3431",
    "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"
   },
@@ -37857,8 +37854,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-2489",
-   "self_type" : "type-2488",
+   "referenced_type" : "type-3589",
+   "self_type" : "type-3588",
    "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"
   },
@@ -37867,8 +37864,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-2653",
-   "self_type" : "type-2652",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
    "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"
   },
@@ -37877,8 +37874,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-2794",
-   "self_type" : "type-2793",
+   "referenced_type" : "type-3894",
+   "self_type" : "type-3893",
    "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"
   },
@@ -37887,8 +37884,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-3785",
-   "self_type" : "type-3784",
+   "referenced_type" : "type-4444",
+   "self_type" : "type-4443",
    "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"
   },
@@ -37897,8 +37894,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-3989",
-   "self_type" : "type-3988",
+   "referenced_type" : "type-4649",
+   "self_type" : "type-4648",
    "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"
   },
@@ -37907,8 +37904,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-4158",
-   "self_type" : "type-4157",
+   "referenced_type" : "type-4820",
+   "self_type" : "type-4819",
    "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"
   },
@@ -37917,8 +37914,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-4858",
-   "self_type" : "type-4857",
+   "referenced_type" : "type-5066",
+   "self_type" : "type-5065",
    "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"
   },
@@ -37927,8 +37924,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-5004",
-   "self_type" : "type-5003",
+   "referenced_type" : "type-5227",
+   "self_type" : "type-5226",
    "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"
   },
@@ -37937,8 +37934,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-5195",
-   "self_type" : "type-5194",
+   "referenced_type" : "type-5507",
+   "self_type" : "type-5506",
    "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"
   },
@@ -37947,8 +37944,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-5405",
-   "self_type" : "type-5404",
+   "referenced_type" : "type-5664",
+   "self_type" : "type-5663",
    "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"
   },
@@ -37957,8 +37954,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-5562",
-   "self_type" : "type-5561",
+   "referenced_type" : "type-5828",
+   "self_type" : "type-5827",
    "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"
   },
@@ -37967,8 +37964,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-5726",
-   "self_type" : "type-5725",
+   "referenced_type" : "type-5969",
+   "self_type" : "type-5968",
    "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"
   },
@@ -37977,8 +37974,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-5867",
-   "self_type" : "type-5866",
+   "referenced_type" : "type-6116",
+   "self_type" : "type-6115",
    "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"
   },
@@ -37987,8 +37984,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-6321",
-   "self_type" : "type-6320",
+   "referenced_type" : "type-6250",
+   "self_type" : "type-6249",
    "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"
   },
@@ -37997,8 +37994,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-6456",
-   "self_type" : "type-6455",
+   "referenced_type" : "type-6383",
+   "self_type" : "type-6382",
    "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"
   },
@@ -38007,8 +38004,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-6602",
-   "self_type" : "type-6601",
+   "referenced_type" : "type-6488",
+   "self_type" : "type-6487",
    "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"
   },
@@ -38027,8 +38024,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-6723",
-   "self_type" : "type-6722",
+   "referenced_type" : "type-7050",
+   "self_type" : "type-7049",
    "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"
   },
@@ -38037,8 +38034,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-7196",
-   "self_type" : "type-7195",
+   "referenced_type" : "type-7293",
+   "self_type" : "type-7292",
    "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"
   },
@@ -38047,8 +38044,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-7396",
-   "self_type" : "type-7395",
+   "referenced_type" : "type-7425",
+   "self_type" : "type-7424",
    "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"
   },
@@ -38057,8 +38054,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-7539",
-   "self_type" : "type-7538",
+   "referenced_type" : "type-7574",
+   "self_type" : "type-7573",
    "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"
   },
@@ -38097,8 +38094,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-2330",
-   "self_type" : "type-2329",
+   "referenced_type" : "type-3430",
+   "self_type" : "type-3429",
    "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"
   },
@@ -38107,8 +38104,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-2487",
-   "self_type" : "type-2486",
+   "referenced_type" : "type-3587",
+   "self_type" : "type-3586",
    "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"
   },
@@ -38117,8 +38114,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-2651",
-   "self_type" : "type-2650",
+   "referenced_type" : "type-3751",
+   "self_type" : "type-3750",
    "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"
   },
@@ -38127,8 +38124,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-2792",
-   "self_type" : "type-2791",
+   "referenced_type" : "type-3892",
+   "self_type" : "type-3891",
    "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"
   },
@@ -38137,8 +38134,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-3783",
-   "self_type" : "type-3782",
+   "referenced_type" : "type-4442",
+   "self_type" : "type-4441",
    "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"
   },
@@ -38147,8 +38144,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-3987",
-   "self_type" : "type-3986",
+   "referenced_type" : "type-4647",
+   "self_type" : "type-4646",
    "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"
   },
@@ -38157,8 +38154,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-4156",
-   "self_type" : "type-4155",
+   "referenced_type" : "type-4818",
+   "self_type" : "type-4817",
    "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"
   },
@@ -38167,8 +38164,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-4856",
-   "self_type" : "type-4855",
+   "referenced_type" : "type-5064",
+   "self_type" : "type-5063",
    "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"
   },
@@ -38177,8 +38174,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-5002",
-   "self_type" : "type-5001",
+   "referenced_type" : "type-5225",
+   "self_type" : "type-5224",
    "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"
   },
@@ -38187,8 +38184,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-5193",
-   "self_type" : "type-5192",
+   "referenced_type" : "type-5505",
+   "self_type" : "type-5504",
    "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"
   },
@@ -38197,8 +38194,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-5403",
-   "self_type" : "type-5402",
+   "referenced_type" : "type-5662",
+   "self_type" : "type-5661",
    "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"
   },
@@ -38207,8 +38204,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-5560",
-   "self_type" : "type-5559",
+   "referenced_type" : "type-5826",
+   "self_type" : "type-5825",
    "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"
   },
@@ -38217,8 +38214,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-5724",
-   "self_type" : "type-5723",
+   "referenced_type" : "type-5967",
+   "self_type" : "type-5966",
    "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"
   },
@@ -38227,8 +38224,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-5865",
-   "self_type" : "type-5864",
+   "referenced_type" : "type-6114",
+   "self_type" : "type-6113",
    "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"
   },
@@ -38237,8 +38234,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-6319",
-   "self_type" : "type-6318",
+   "referenced_type" : "type-6248",
+   "self_type" : "type-6247",
    "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"
   },
@@ -38247,8 +38244,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-6454",
-   "self_type" : "type-6453",
+   "referenced_type" : "type-6381",
+   "self_type" : "type-6380",
    "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"
   },
@@ -38257,8 +38254,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-6599",
-   "self_type" : "type-6598",
+   "referenced_type" : "type-6486",
+   "self_type" : "type-6485",
    "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"
   },
@@ -38277,8 +38274,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-6721",
-   "self_type" : "type-6720",
+   "referenced_type" : "type-7048",
+   "self_type" : "type-7047",
    "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"
   },
@@ -38287,8 +38284,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-7194",
-   "self_type" : "type-7193",
+   "referenced_type" : "type-7291",
+   "self_type" : "type-7290",
    "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"
   },
@@ -38297,8 +38294,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-7394",
-   "self_type" : "type-7393",
+   "referenced_type" : "type-7423",
+   "self_type" : "type-7422",
    "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"
   },
@@ -38307,8 +38304,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-7537",
-   "self_type" : "type-7536",
+   "referenced_type" : "type-7572",
+   "self_type" : "type-7571",
    "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"
   },
@@ -38347,8 +38344,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-2328",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-3428",
+   "self_type" : "type-3427",
    "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"
   },
@@ -38357,8 +38354,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-2485",
-   "self_type" : "type-2484",
+   "referenced_type" : "type-3585",
+   "self_type" : "type-3584",
    "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"
   },
@@ -38367,8 +38364,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-2649",
-   "self_type" : "type-2648",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3748",
    "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"
   },
@@ -38377,8 +38374,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-2790",
-   "self_type" : "type-2789",
+   "referenced_type" : "type-3890",
+   "self_type" : "type-3889",
    "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"
   },
@@ -38387,8 +38384,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-3781",
-   "self_type" : "type-3780",
+   "referenced_type" : "type-4440",
+   "self_type" : "type-4439",
    "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"
   },
@@ -38397,8 +38394,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-3985",
-   "self_type" : "type-3984",
+   "referenced_type" : "type-4645",
+   "self_type" : "type-4644",
    "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"
   },
@@ -38407,8 +38404,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-4154",
-   "self_type" : "type-4153",
+   "referenced_type" : "type-4816",
+   "self_type" : "type-4815",
    "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"
   },
@@ -38417,8 +38414,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-4854",
-   "self_type" : "type-4853",
+   "referenced_type" : "type-5062",
+   "self_type" : "type-5061",
    "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"
   },
@@ -38427,8 +38424,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-5000",
-   "self_type" : "type-4999",
+   "referenced_type" : "type-5223",
+   "self_type" : "type-5222",
    "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"
   },
@@ -38437,8 +38434,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-5190",
-   "self_type" : "type-5189",
+   "referenced_type" : "type-5503",
+   "self_type" : "type-5502",
    "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"
   },
@@ -38447,8 +38444,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-5401",
-   "self_type" : "type-5400",
+   "referenced_type" : "type-5660",
+   "self_type" : "type-5659",
    "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"
   },
@@ -38457,8 +38454,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-5558",
-   "self_type" : "type-5557",
+   "referenced_type" : "type-5824",
+   "self_type" : "type-5823",
    "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"
   },
@@ -38467,8 +38464,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-5722",
-   "self_type" : "type-5721",
+   "referenced_type" : "type-5965",
+   "self_type" : "type-5964",
    "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"
   },
@@ -38477,8 +38474,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-5863",
-   "self_type" : "type-5862",
+   "referenced_type" : "type-6112",
+   "self_type" : "type-6111",
    "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"
   },
@@ -38487,8 +38484,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-6317",
-   "self_type" : "type-6316",
+   "referenced_type" : "type-6246",
+   "self_type" : "type-6245",
    "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"
   },
@@ -38497,8 +38494,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-6452",
-   "self_type" : "type-6451",
+   "referenced_type" : "type-6379",
+   "self_type" : "type-6378",
    "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"
   },
@@ -38507,8 +38504,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-6597",
-   "self_type" : "type-6596",
+   "referenced_type" : "type-6484",
+   "self_type" : "type-6483",
    "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"
   },
@@ -38527,8 +38524,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-6719",
-   "self_type" : "type-6718",
+   "referenced_type" : "type-7046",
+   "self_type" : "type-7045",
    "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"
   },
@@ -38537,8 +38534,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-7192",
-   "self_type" : "type-7191",
+   "referenced_type" : "type-7289",
+   "self_type" : "type-7288",
    "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"
   },
@@ -38547,8 +38544,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-7392",
-   "self_type" : "type-7391",
+   "referenced_type" : "type-7421",
+   "self_type" : "type-7420",
    "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"
   },
@@ -38557,8 +38554,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-7535",
-   "self_type" : "type-7534",
+   "referenced_type" : "type-7570",
+   "self_type" : "type-7569",
    "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"
   },
@@ -38597,8 +38594,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-2336",
-   "self_type" : "type-2335",
+   "referenced_type" : "type-3436",
+   "self_type" : "type-3435",
    "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"
   },
@@ -38607,8 +38604,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-2493",
-   "self_type" : "type-2492",
+   "referenced_type" : "type-3593",
+   "self_type" : "type-3592",
    "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"
   },
@@ -38617,8 +38614,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-2657",
-   "self_type" : "type-2656",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3756",
    "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"
   },
@@ -38627,8 +38624,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-2799",
-   "self_type" : "type-2798",
+   "referenced_type" : "type-3899",
+   "self_type" : "type-3898",
    "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"
   },
@@ -38637,8 +38634,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-3789",
-   "self_type" : "type-3788",
+   "referenced_type" : "type-4448",
+   "self_type" : "type-4447",
    "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"
   },
@@ -38647,8 +38644,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-3993",
-   "self_type" : "type-3992",
+   "referenced_type" : "type-4653",
+   "self_type" : "type-4652",
    "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"
   },
@@ -38657,8 +38654,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-4162",
-   "self_type" : "type-4161",
+   "referenced_type" : "type-4824",
+   "self_type" : "type-4823",
    "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"
   },
@@ -38667,8 +38664,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-4863",
-   "self_type" : "type-4862",
+   "referenced_type" : "type-5071",
+   "self_type" : "type-5070",
    "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"
   },
@@ -38677,8 +38674,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-5008",
-   "self_type" : "type-5007",
+   "referenced_type" : "type-5234",
+   "self_type" : "type-5233",
    "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"
   },
@@ -38687,8 +38684,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-5201",
-   "self_type" : "type-5200",
+   "referenced_type" : "type-5511",
+   "self_type" : "type-5510",
    "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"
   },
@@ -38697,8 +38694,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-5409",
-   "self_type" : "type-5408",
+   "referenced_type" : "type-5668",
+   "self_type" : "type-5667",
    "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"
   },
@@ -38707,8 +38704,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-5566",
-   "self_type" : "type-5565",
+   "referenced_type" : "type-5832",
+   "self_type" : "type-5831",
    "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"
   },
@@ -38717,8 +38714,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-5730",
-   "self_type" : "type-5729",
+   "referenced_type" : "type-5974",
+   "self_type" : "type-5973",
    "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"
   },
@@ -38727,8 +38724,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-5872",
-   "self_type" : "type-5871",
+   "referenced_type" : "type-6121",
+   "self_type" : "type-6120",
    "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"
   },
@@ -38737,8 +38734,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-6325",
-   "self_type" : "type-6324",
+   "referenced_type" : "type-6254",
+   "self_type" : "type-6253",
    "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"
   },
@@ -38747,8 +38744,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-6460",
-   "self_type" : "type-6459",
+   "referenced_type" : "type-6387",
+   "self_type" : "type-6386",
    "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"
   },
@@ -38757,8 +38754,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-6606",
-   "self_type" : "type-6605",
+   "referenced_type" : "type-6492",
+   "self_type" : "type-6491",
    "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"
   },
@@ -38777,8 +38774,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-6727",
-   "self_type" : "type-6726",
+   "referenced_type" : "type-7054",
+   "self_type" : "type-7053",
    "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"
   },
@@ -38787,8 +38784,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-7200",
-   "self_type" : "type-7199",
+   "referenced_type" : "type-7298",
+   "self_type" : "type-7297",
    "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"
   },
@@ -38797,8 +38794,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-7402",
-   "self_type" : "type-7401",
+   "referenced_type" : "type-7429",
+   "self_type" : "type-7428",
    "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"
   },
@@ -38807,8 +38804,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-7544",
-   "self_type" : "type-7543",
+   "referenced_type" : "type-7578",
+   "self_type" : "type-7577",
    "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"
   },
@@ -38857,8 +38854,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-2256",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-3356",
+   "self_type" : "type-3355",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38867,8 +38864,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-2444",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-3544",
+   "self_type" : "type-3543",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38877,8 +38874,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-2553",
-   "self_type" : "type-2552",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3652",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38887,8 +38884,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-2617",
-   "self_type" : "type-2616",
+   "referenced_type" : "type-3717",
+   "self_type" : "type-3716",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38897,8 +38894,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-2741",
-   "self_type" : "type-2740",
+   "referenced_type" : "type-3841",
+   "self_type" : "type-3840",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38907,8 +38904,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-3737",
-   "self_type" : "type-3736",
+   "referenced_type" : "type-4396",
+   "self_type" : "type-4395",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38917,8 +38914,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-3851",
-   "self_type" : "type-3850",
+   "referenced_type" : "type-4511",
+   "self_type" : "type-4510",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38927,8 +38924,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-3888",
-   "self_type" : "type-3887",
+   "referenced_type" : "type-4548",
+   "self_type" : "type-4547",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38937,8 +38934,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-3946",
-   "self_type" : "type-3945",
+   "referenced_type" : "type-4606",
+   "self_type" : "type-4605",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38947,8 +38944,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-4114",
-   "self_type" : "type-4113",
+   "referenced_type" : "type-4776",
+   "self_type" : "type-4775",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38957,8 +38954,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-4192",
-   "self_type" : "type-4191",
+   "referenced_type" : "type-4854",
+   "self_type" : "type-4853",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38967,8 +38964,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-4784",
-   "self_type" : "type-4783",
+   "referenced_type" : "type-5073",
+   "self_type" : "type-5072",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38977,8 +38974,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-4865",
-   "self_type" : "type-4864",
+   "referenced_type" : "type-5127",
+   "self_type" : "type-5126",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -38987,38 +38984,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-4908",
-   "self_type" : "type-4907",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-5010",
-   "self_type" : "type-5009",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-5079",
-   "self_type" : "type-5078",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-5147",
-   "self_type" : "type-5146",
+   "referenced_type" : "type-5183",
+   "self_type" : "type-5182",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39037,8 +39004,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-5329",
-   "self_type" : "type-5328",
+   "referenced_type" : "type-5431",
+   "self_type" : "type-5430",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39047,8 +39014,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-5517",
-   "self_type" : "type-5516",
+   "referenced_type" : "type-5619",
+   "self_type" : "type-5618",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39057,8 +39024,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-5626",
-   "self_type" : "type-5625",
+   "referenced_type" : "type-5728",
+   "self_type" : "type-5727",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39067,8 +39034,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-5690",
-   "self_type" : "type-5689",
+   "referenced_type" : "type-5792",
+   "self_type" : "type-5791",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39077,8 +39044,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-5814",
-   "self_type" : "type-5813",
+   "referenced_type" : "type-5916",
+   "self_type" : "type-5915",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39087,8 +39054,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-6280",
-   "self_type" : "type-6279",
+   "referenced_type" : "type-6072",
+   "self_type" : "type-6071",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39097,8 +39064,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-6411",
-   "self_type" : "type-6410",
+   "referenced_type" : "type-6205",
+   "self_type" : "type-6204",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39107,8 +39074,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-6507",
-   "self_type" : "type-6506",
+   "referenced_type" : "type-6301",
+   "self_type" : "type-6300",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39117,8 +39084,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-6564",
-   "self_type" : "type-6563",
+   "referenced_type" : "type-6347",
+   "self_type" : "type-6346",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39127,8 +39094,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-6675",
-   "self_type" : "type-6674",
+   "referenced_type" : "type-6439",
+   "self_type" : "type-6438",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39137,8 +39104,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-7143",
-   "self_type" : "type-7142",
+   "referenced_type" : "type-6996",
+   "self_type" : "type-6995",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39147,8 +39114,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-7249",
-   "self_type" : "type-7248",
+   "referenced_type" : "type-7115",
+   "self_type" : "type-7114",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39157,8 +39124,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-7282",
-   "self_type" : "type-7281",
+   "referenced_type" : "type-7167",
+   "self_type" : "type-7166",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39167,8 +39134,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-7351",
-   "self_type" : "type-7350",
+   "referenced_type" : "type-7246",
+   "self_type" : "type-7245",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39177,8 +39144,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-7495",
-   "self_type" : "type-7494",
+   "referenced_type" : "type-7385",
+   "self_type" : "type-7384",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39187,8 +39154,38 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-7576",
-   "self_type" : "type-7575",
+   "referenced_type" : "type-7449",
+   "self_type" : "type-7448",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-7489",
+   "self_type" : "type-7488",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-7580",
+   "self_type" : "type-7579",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-7621",
+   "self_type" : "type-7620",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -39207,8 +39204,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-4103",
-   "self_type" : "type-4102",
+   "referenced_type" : "type-4764",
+   "self_type" : "type-4763",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39217,8 +39214,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-4205",
-   "self_type" : "type-4204",
+   "referenced_type" : "type-4867",
+   "self_type" : "type-4866",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39227,8 +39224,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-4884",
-   "self_type" : "type-4883",
+   "referenced_type" : "type-5086",
+   "self_type" : "type-5085",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39237,8 +39234,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-5021",
-   "self_type" : "type-5020",
+   "referenced_type" : "type-5139",
+   "self_type" : "type-5138",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39247,8 +39244,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-5099",
-   "self_type" : "type-5098",
+   "referenced_type" : "type-7375",
+   "self_type" : "type-7374",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39257,8 +39254,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-7485",
-   "self_type" : "type-7484",
+   "referenced_type" : "type-7469",
+   "self_type" : "type-7468",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39267,8 +39264,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-7594",
-   "self_type" : "type-7593",
+   "referenced_type" : "type-7597",
+   "self_type" : "type-7596",
    "size" : 24,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39277,8 +39274,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "referenced_type" : "type-1926",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-2646",
+   "self_type" : "type-2645",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39287,8 +39284,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "referenced_type" : "type-4327",
-   "self_type" : "type-4326",
+   "referenced_type" : "type-4991",
+   "self_type" : "type-4990",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39297,8 +39294,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "referenced_type" : "type-6247",
-   "self_type" : "type-6246",
+   "referenced_type" : "type-6036",
+   "self_type" : "type-6035",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39307,8 +39304,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "referenced_type" : "type-7413",
-   "self_type" : "type-7412",
+   "referenced_type" : "type-7529",
+   "self_type" : "type-7528",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39317,8 +39314,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-1922",
-   "self_type" : "type-1921",
+   "referenced_type" : "type-2642",
+   "self_type" : "type-2641",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39327,8 +39324,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-4323",
-   "self_type" : "type-4322",
+   "referenced_type" : "type-4987",
+   "self_type" : "type-4986",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39337,8 +39334,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-6244",
-   "self_type" : "type-6243",
+   "referenced_type" : "type-6033",
+   "self_type" : "type-6032",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39347,8 +39344,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-7398",
-   "self_type" : "type-7397",
+   "referenced_type" : "type-7513",
+   "self_type" : "type-7512",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39357,8 +39354,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
    "name" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
-   "referenced_type" : "type-4096",
-   "self_type" : "type-4095",
+   "referenced_type" : "type-4756",
+   "self_type" : "type-4755",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39367,8 +39364,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
    "name" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
-   "referenced_type" : "type-4201",
-   "self_type" : "type-4200",
+   "referenced_type" : "type-4863",
+   "self_type" : "type-4862",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39377,8 +39374,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
    "name" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
-   "referenced_type" : "type-4875",
-   "self_type" : "type-4874",
+   "referenced_type" : "type-5077",
+   "self_type" : "type-5076",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39387,8 +39384,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
    "name" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
-   "referenced_type" : "type-5012",
-   "self_type" : "type-5011",
+   "referenced_type" : "type-5135",
+   "self_type" : "type-5134",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39397,8 +39394,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
    "name" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
-   "referenced_type" : "type-5095",
-   "self_type" : "type-5094",
+   "referenced_type" : "type-7369",
+   "self_type" : "type-7368",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39407,8 +39404,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
    "name" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
-   "referenced_type" : "type-7478",
-   "self_type" : "type-7477",
+   "referenced_type" : "type-7465",
+   "self_type" : "type-7464",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39417,8 +39414,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
    "name" : "const std::unique_ptr<android::base::LogMessageData, std::default_delete<android::base::LogMessageData> >",
-   "referenced_type" : "type-7590",
-   "self_type" : "type-7589",
+   "referenced_type" : "type-7588",
+   "self_type" : "type-7587",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h"
   },
@@ -39427,8 +39424,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> >",
    "name" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> >",
-   "referenced_type" : "type-3076",
-   "self_type" : "type-3075",
+   "referenced_type" : "type-1645",
+   "self_type" : "type-1644",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39437,8 +39434,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> >",
    "name" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> >",
-   "referenced_type" : "type-6080",
-   "self_type" : "type-6079",
+   "referenced_type" : "type-4107",
+   "self_type" : "type-4106",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39447,8 +39444,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> >",
    "name" : "const std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> >",
-   "referenced_type" : "type-6898",
-   "self_type" : "type-6897",
+   "referenced_type" : "type-6694",
+   "self_type" : "type-6693",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -39487,8 +39484,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2173",
-   "self_type" : "type-2172",
+   "referenced_type" : "type-3273",
+   "self_type" : "type-3272",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39497,8 +39494,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3537",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39507,8 +39504,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3647",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39517,8 +39514,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2611",
-   "self_type" : "type-2610",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3710",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39527,58 +39524,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2733",
-   "self_type" : "type-2732",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3697",
-   "self_type" : "type-3696",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3830",
-   "self_type" : "type-3829",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3899",
-   "self_type" : "type-3898",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3963",
-   "self_type" : "type-3962",
-   "size" : 24,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-4003",
-   "self_type" : "type-4002",
+   "referenced_type" : "type-3833",
+   "self_type" : "type-3832",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39597,8 +39544,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-4209",
-   "self_type" : "type-4208",
+   "referenced_type" : "type-4355",
+   "self_type" : "type-4354",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39607,8 +39554,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-4793",
-   "self_type" : "type-4792",
+   "referenced_type" : "type-4490",
+   "self_type" : "type-4489",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39617,8 +39564,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-4798",
-   "self_type" : "type-4797",
+   "referenced_type" : "type-4559",
+   "self_type" : "type-4558",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39627,8 +39574,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-4922",
-   "self_type" : "type-4921",
+   "referenced_type" : "type-4623",
+   "self_type" : "type-4622",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39637,8 +39584,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-4933",
-   "self_type" : "type-4932",
+   "referenced_type" : "type-4663",
+   "self_type" : "type-4662",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39647,8 +39594,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-5105",
-   "self_type" : "type-5104",
+   "referenced_type" : "type-4871",
+   "self_type" : "type-4870",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39657,8 +39604,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-5138",
-   "self_type" : "type-5137",
+   "referenced_type" : "type-5143",
+   "self_type" : "type-5142",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39667,8 +39614,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-5246",
-   "self_type" : "type-5245",
+   "referenced_type" : "type-5172",
+   "self_type" : "type-5171",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39677,8 +39624,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-5511",
-   "self_type" : "type-5510",
+   "referenced_type" : "type-5348",
+   "self_type" : "type-5347",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39687,8 +39634,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-5621",
-   "self_type" : "type-5620",
+   "referenced_type" : "type-5613",
+   "self_type" : "type-5612",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39697,8 +39644,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-5684",
-   "self_type" : "type-5683",
+   "referenced_type" : "type-5723",
+   "self_type" : "type-5722",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39707,8 +39654,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-5806",
-   "self_type" : "type-5805",
+   "referenced_type" : "type-5786",
+   "self_type" : "type-5785",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39717,8 +39664,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-6271",
-   "self_type" : "type-6270",
+   "referenced_type" : "type-5908",
+   "self_type" : "type-5907",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39727,8 +39674,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-6404",
-   "self_type" : "type-6403",
+   "referenced_type" : "type-6063",
+   "self_type" : "type-6062",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39737,8 +39684,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-6502",
-   "self_type" : "type-6501",
+   "referenced_type" : "type-6200",
+   "self_type" : "type-6199",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39747,8 +39694,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-6556",
-   "self_type" : "type-6555",
+   "referenced_type" : "type-6296",
+   "self_type" : "type-6295",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39757,8 +39704,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-6664",
-   "self_type" : "type-6663",
+   "referenced_type" : "type-6340",
+   "self_type" : "type-6339",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39767,8 +39714,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-7099",
-   "self_type" : "type-7098",
+   "referenced_type" : "type-6432",
+   "self_type" : "type-6431",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39777,8 +39724,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-7230",
-   "self_type" : "type-7229",
+   "referenced_type" : "type-6953",
+   "self_type" : "type-6952",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39787,8 +39734,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-7291",
-   "self_type" : "type-7290",
+   "referenced_type" : "type-7092",
+   "self_type" : "type-7091",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39797,8 +39744,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-7368",
-   "self_type" : "type-7367",
+   "referenced_type" : "type-7180",
+   "self_type" : "type-7179",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39807,8 +39754,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-7410",
-   "self_type" : "type-7409",
+   "referenced_type" : "type-7263",
+   "self_type" : "type-7262",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39817,8 +39764,58 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-7599",
-   "self_type" : "type-7598",
+   "referenced_type" : "type-7307",
+   "self_type" : "type-7306",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7474",
+   "self_type" : "type-7473",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7500",
+   "self_type" : "type-7499",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7505",
+   "self_type" : "type-7504",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7633",
+   "self_type" : "type-7632",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7645",
+   "self_type" : "type-7644",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -39837,8 +39834,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> >",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> >",
-   "referenced_type" : "type-3721",
-   "self_type" : "type-3720",
+   "referenced_type" : "type-4380",
+   "self_type" : "type-4379",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39847,8 +39844,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> >",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> >",
-   "referenced_type" : "type-3848",
-   "self_type" : "type-3847",
+   "referenced_type" : "type-4508",
+   "self_type" : "type-4507",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39857,8 +39854,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> >",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> >",
-   "referenced_type" : "type-7123",
-   "self_type" : "type-7122",
+   "referenced_type" : "type-6977",
+   "self_type" : "type-6976",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39867,8 +39864,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<unsigned char, std::allocator<unsigned char> >",
    "name" : "const std::vector<unsigned char, std::allocator<unsigned char> >",
-   "referenced_type" : "type-7246",
-   "self_type" : "type-7245",
+   "referenced_type" : "type-7111",
+   "self_type" : "type-7110",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -39918,7 +39915,7 @@
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
    "referenced_type" : "type-500",
-   "self_type" : "type-1794",
+   "self_type" : "type-2521",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -39964,7 +39961,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -39979,8 +39976,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1457",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
@@ -39996,7 +39993,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40016,8 +40013,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1461",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2190",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
@@ -40033,7 +40030,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40058,8 +40055,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1459",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -40075,7 +40072,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40095,7 +40092,7 @@
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1475"
     },
     {
      "field_name" : "bIsMIDI",
@@ -40105,8 +40102,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-1456",
-   "self_type" : "type-1456",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2185",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -40122,7 +40119,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40137,12 +40134,12 @@
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "nModulationDepth",
@@ -40152,13 +40149,13 @@
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-1467",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -40174,7 +40171,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40184,13 +40181,13 @@
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-2198"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
@@ -40206,7 +40203,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40221,23 +40218,23 @@
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1475"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-1464",
-   "self_type" : "type-1464",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2193",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -40253,7 +40250,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40268,8 +40265,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2189",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
@@ -40285,7 +40282,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40295,17 +40292,17 @@
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1475"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "nMaxPolyphony",
@@ -40355,8 +40352,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-1445",
-   "self_type" : "type-1445",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2167",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -40372,7 +40369,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40387,13 +40384,13 @@
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-2146",
+   "self_type" : "type-2146",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -40409,7 +40406,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40429,13 +40426,13 @@
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-1454",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2183",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -40451,7 +40448,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40486,8 +40483,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2182",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -40503,7 +40500,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40533,8 +40530,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1444",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2157",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -40550,7 +40547,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40590,13 +40587,13 @@
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-1446"
+     "referenced_type" : "type-2171"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1447",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2172",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -40612,7 +40609,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40627,8 +40624,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1458",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2187",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -40644,7 +40641,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40659,8 +40656,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1471",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2200",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -40676,7 +40673,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40691,42 +40688,42 @@
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1475"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1475"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1475"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1475"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "nDensity",
@@ -40741,13 +40738,13 @@
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-1468",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2197",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -40763,7 +40760,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40778,7 +40775,7 @@
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-2194"
     },
     {
      "field_name" : "nStereoWidening",
@@ -40788,8 +40785,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1466",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2195",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -40805,7 +40802,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40825,8 +40822,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1462",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2191",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -40842,7 +40839,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40857,13 +40854,13 @@
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-1356"
+     "referenced_type" : "type-1475"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1455",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2184",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -40879,7 +40876,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40924,23 +40921,23 @@
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1678"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1671"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1653"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-1401",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1689",
+   "self_type" : "type-1689",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -40956,7 +40953,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -40981,8 +40978,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-1411",
-   "self_type" : "type-1411",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1800",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -40998,7 +40995,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41018,23 +41015,23 @@
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-1419"
+     "referenced_type" : "type-1892"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-1420"
+     "referenced_type" : "type-1903"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-1418"
+     "referenced_type" : "type-1882"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1914",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -41050,7 +41047,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41065,7 +41062,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-1431"
+     "referenced_type" : "type-2024"
     },
     {
      "field_name" : "bRATE_REDUCon",
@@ -41100,8 +41097,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-1434",
-   "self_type" : "type-1434",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2057",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -41117,7 +41114,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41142,8 +41139,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1711",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -41159,7 +41156,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41179,7 +41176,7 @@
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-1412"
+     "referenced_type" : "type-1810"
     },
     {
      "field_name" : "bHiPassFilter",
@@ -41194,8 +41191,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-1413",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1823",
+   "self_type" : "type-1823",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -41211,7 +41208,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41226,13 +41223,13 @@
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-1414"
+     "referenced_type" : "type-1833"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-1415",
-   "self_type" : "type-1415",
+   "referenced_type" : "type-1843",
+   "self_type" : "type-1843",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -41248,7 +41245,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41268,13 +41265,13 @@
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-1416"
+     "referenced_type" : "type-1855"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-1417",
-   "self_type" : "type-1417",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1870",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -41290,7 +41287,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41310,8 +41307,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1947",
+   "self_type" : "type-1947",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
@@ -41327,7 +41324,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41347,8 +41344,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-1925",
+   "self_type" : "type-1925",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -41364,7 +41361,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41384,8 +41381,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1936",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
@@ -41401,7 +41398,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41426,18 +41423,18 @@
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 256,
-     "referenced_type" : "type-1440"
+     "referenced_type" : "type-2113"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 288,
-     "referenced_type" : "type-1441"
+     "referenced_type" : "type-2124"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2135",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -41453,7 +41450,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41468,7 +41465,7 @@
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-1355"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "bLoadDefaultSound",
@@ -41478,13 +41475,13 @@
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-1437"
+     "referenced_type" : "type-2090"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-1439",
-   "self_type" : "type-1439",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2102",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -41500,7 +41497,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41530,18 +41527,18 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1653"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-1397"
+     "referenced_type" : "type-1663"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-1398",
-   "self_type" : "type-1398",
+   "referenced_type" : "type-1667",
+   "self_type" : "type-1667",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -41557,7 +41554,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41572,12 +41569,12 @@
     {
      "field_name" : "eNumData",
      "field_offset" : 128,
-     "referenced_type" : "type-1354"
+     "referenced_type" : "type-1467"
     },
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-1353"
+     "referenced_type" : "type-1463"
     },
     {
      "field_name" : "bInterleaved",
@@ -41597,18 +41594,18 @@
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-1392"
+     "referenced_type" : "type-1634"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-1395"
+     "referenced_type" : "type-1643"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-1394",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1642",
+   "self_type" : "type-1642",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -41624,7 +41621,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41649,8 +41646,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-1429",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2002",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
@@ -41666,7 +41663,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41691,8 +41688,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1991",
+   "self_type" : "type-1991",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
@@ -41708,7 +41705,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41733,8 +41730,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2013",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
@@ -41750,7 +41747,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41765,13 +41762,13 @@
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1619"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1629",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
@@ -41787,7 +41784,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41802,7 +41799,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-1431"
+     "referenced_type" : "type-2024"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41817,8 +41814,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2046",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -41834,7 +41831,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41854,7 +41851,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-1431"
+     "referenced_type" : "type-2024"
     },
     {
      "field_name" : "nMinBitRate",
@@ -41869,8 +41866,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-2035",
+   "self_type" : "type-2035",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -41886,7 +41883,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41931,13 +41928,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-1407"
+     "referenced_type" : "type-1757"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-1408",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1767",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -41953,7 +41950,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -41998,18 +41995,18 @@
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1653"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-1409"
+     "referenced_type" : "type-1777"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1410",
+   "referenced_type" : "type-1790",
+   "self_type" : "type-1790",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -42025,7 +42022,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42040,7 +42037,7 @@
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-1431"
+     "referenced_type" : "type-2024"
     },
     {
      "field_name" : "bRATE_REDUCon",
@@ -42075,8 +42072,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-1435",
-   "self_type" : "type-1435",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2068",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
@@ -42092,7 +42089,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42117,8 +42114,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-1427",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1980",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
@@ -42134,7 +42131,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42159,8 +42156,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1969",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -42176,7 +42173,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42231,8 +42228,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1700",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -42248,7 +42245,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42268,12 +42265,12 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1724"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1734"
     },
     {
      "field_name" : "nSamplingRate",
@@ -42298,8 +42295,8 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1744",
+   "self_type" : "type-1744",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -42325,13 +42322,13 @@
     {
      "field_name" : "eEncoding",
      "field_offset" : 160,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1619"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-1390",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-1620",
+   "self_type" : "type-1620",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -42357,8 +42354,8 @@
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1475",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BS32"
@@ -42384,8 +42381,8 @@
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1470",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -42401,7 +42398,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "pBuffer",
@@ -42481,8 +42478,8 @@
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1373",
+   "referenced_type" : "type-1544",
+   "self_type" : "type-1544",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -42493,23 +42490,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-1592"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-1383"
+     "referenced_type" : "type-1594"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 128,
-     "referenced_type" : "type-1383"
+     "referenced_type" : "type-1594"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1591",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -42525,13 +42522,13 @@
     {
      "field_name" : "pInitialize",
      "field_offset" : 64,
-     "referenced_type" : "type-1367"
+     "referenced_type" : "type-1505"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-1366",
-   "self_type" : "type-1366",
+   "referenced_type" : "type-1504",
+   "self_type" : "type-1504",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -42547,7 +42544,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "pComponentPrivate",
@@ -42562,98 +42559,98 @@
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 192,
-     "referenced_type" : "type-1630"
+     "referenced_type" : "type-2359"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 256,
-     "referenced_type" : "type-1634"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 320,
-     "referenced_type" : "type-1636"
+     "referenced_type" : "type-2365"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 384,
-     "referenced_type" : "type-1636"
+     "referenced_type" : "type-2365"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 448,
-     "referenced_type" : "type-1636"
+     "referenced_type" : "type-2365"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 512,
-     "referenced_type" : "type-1636"
+     "referenced_type" : "type-2365"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 576,
-     "referenced_type" : "type-1638"
+     "referenced_type" : "type-2367"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 640,
-     "referenced_type" : "type-1641"
+     "referenced_type" : "type-2370"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 704,
-     "referenced_type" : "type-1644"
+     "referenced_type" : "type-2373"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 768,
-     "referenced_type" : "type-1647"
+     "referenced_type" : "type-2376"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 832,
-     "referenced_type" : "type-1650"
+     "referenced_type" : "type-2379"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 896,
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-2381"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 960,
-     "referenced_type" : "type-1654"
+     "referenced_type" : "type-2383"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-1654"
+     "referenced_type" : "type-2383"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 1088,
-     "referenced_type" : "type-1656"
+     "referenced_type" : "type-2385"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 1152,
-     "referenced_type" : "type-1367"
+     "referenced_type" : "type-1505"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 1216,
-     "referenced_type" : "type-1659"
+     "referenced_type" : "type-2388"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 1280,
-     "referenced_type" : "type-1661"
+     "referenced_type" : "type-2390"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-1629",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2358",
    "size" : 168,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -42669,7 +42666,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42689,8 +42686,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-1499",
-   "self_type" : "type-1499",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2228",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -42706,7 +42703,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bEnabled",
@@ -42716,8 +42713,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-1613",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2342",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
@@ -42733,7 +42730,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42748,8 +42745,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-1498",
-   "self_type" : "type-1498",
+   "referenced_type" : "type-2227",
+   "self_type" : "type-2227",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
@@ -42765,7 +42762,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42790,8 +42787,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-1514",
-   "self_type" : "type-1514",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2243",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
@@ -42807,7 +42804,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42822,13 +42819,13 @@
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-1482"
+     "referenced_type" : "type-2211"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-1483",
-   "self_type" : "type-1483",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2212",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORBLENDTYPE"
@@ -42844,7 +42841,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42854,7 +42851,7 @@
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-1474"
+     "referenced_type" : "type-2203"
     },
     {
      "field_name" : "xColorOffset",
@@ -42864,8 +42861,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-1473",
-   "self_type" : "type-1473",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2202",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -42881,7 +42878,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42906,8 +42903,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2209",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
@@ -42923,7 +42920,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -42943,8 +42940,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2210",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
@@ -42960,7 +42957,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bAllKeys",
@@ -42980,8 +42977,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-1623",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
@@ -42997,7 +42994,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bAllKeys",
@@ -43032,8 +43029,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-1627",
-   "self_type" : "type-1627",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2356",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -43049,7 +43046,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43064,8 +43061,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-1497",
-   "self_type" : "type-1497",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CONTRASTTYPE"
@@ -43081,7 +43078,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43091,13 +43088,13 @@
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-1511"
+     "referenced_type" : "type-2240"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-1512",
-   "self_type" : "type-1512",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2241",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -43113,7 +43110,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43123,13 +43120,13 @@
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-1494"
+     "referenced_type" : "type-2223"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSURECONTROLTYPE"
@@ -43145,7 +43142,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43155,7 +43152,7 @@
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-1515"
+     "referenced_type" : "type-2244"
     },
     {
      "field_name" : "xEVCompensation",
@@ -43195,8 +43192,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1516",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -43212,7 +43209,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43267,8 +43264,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2247",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -43284,7 +43281,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43299,8 +43296,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-1559",
-   "self_type" : "type-1559",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2288",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
@@ -43316,7 +43313,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43331,8 +43328,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1491",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2220",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -43348,7 +43345,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43363,8 +43360,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-1500",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2229",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_GAMMATYPE"
@@ -43380,7 +43377,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43390,13 +43387,13 @@
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-2207"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1479",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -43412,7 +43409,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43427,8 +43424,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2289",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_INTRAREFRESHVOPTYPE"
@@ -43444,7 +43441,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43459,8 +43456,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1503",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2232",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
@@ -43476,7 +43473,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43491,13 +43488,13 @@
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-1561",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2290",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -43513,7 +43510,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43528,8 +43525,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2292",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -43545,12 +43542,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -43565,8 +43562,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-1621",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2350",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -43582,12 +43579,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "nScopeSpecifier",
@@ -43602,12 +43599,12 @@
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-1620"
+     "referenced_type" : "type-2349"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-2347"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -43617,12 +43614,12 @@
     {
      "field_name" : "nKey",
      "field_offset" : 232,
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1528"
     },
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-2347"
     },
     {
      "field_name" : "sLanguageCountry",
@@ -43642,13 +43639,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 1472,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-1622",
-   "self_type" : "type-1622",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2351",
    "size" : 192,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -43664,7 +43661,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43674,13 +43671,13 @@
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-1486"
+     "referenced_type" : "type-2215"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1487",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_MIRRORTYPE"
@@ -43696,7 +43693,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43716,8 +43713,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1504",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2233",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
@@ -43733,7 +43730,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43753,8 +43750,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1488",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2217",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -43770,7 +43767,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43800,8 +43797,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1489",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -43817,7 +43814,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43832,8 +43829,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1485",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2214",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -43849,7 +43846,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43864,8 +43861,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1501",
+   "referenced_type" : "type-2230",
+   "self_type" : "type-2230",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -43881,7 +43878,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43901,8 +43898,8 @@
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2206",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
@@ -43918,7 +43915,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43928,13 +43925,13 @@
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-1506"
+     "referenced_type" : "type-2235"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1507",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2236",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -43950,7 +43947,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -43960,13 +43957,13 @@
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-1492"
+     "referenced_type" : "type-2221"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-1493",
-   "self_type" : "type-1493",
+   "referenced_type" : "type-2222",
+   "self_type" : "type-2222",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
@@ -43982,7 +43979,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44002,8 +43999,8 @@
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1484",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2213",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -44019,7 +44016,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44029,7 +44026,7 @@
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-1576"
+     "referenced_type" : "type-2305"
     },
     {
      "field_name" : "nFocusSteps",
@@ -44044,8 +44041,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1577",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2306",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -44061,7 +44058,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44071,13 +44068,13 @@
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-1573"
+     "referenced_type" : "type-2302"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-1575",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-2304",
+   "self_type" : "type-2304",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
@@ -44093,7 +44090,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44103,23 +44100,23 @@
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-1582"
+     "referenced_type" : "type-2311"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-1584"
+     "referenced_type" : "type-2313"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-1585"
+     "referenced_type" : "type-2314"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-1583",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2312",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -44135,7 +44132,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44150,18 +44147,18 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-1570"
+     "referenced_type" : "type-2299"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-1472"
+     "referenced_type" : "type-2201"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2301",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -44177,7 +44174,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44192,8 +44189,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-1578",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2307",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -44209,7 +44206,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44219,18 +44216,18 @@
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-1579"
+     "referenced_type" : "type-2308"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-1581"
+     "referenced_type" : "type-2310"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2309",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -44276,12 +44273,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-1570"
+     "referenced_type" : "type-2299"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-1472"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "pNativeWindow",
@@ -44291,8 +44288,8 @@
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-1571",
-   "self_type" : "type-1571",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2300",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -44313,8 +44310,8 @@
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-1357",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-1478",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -44330,7 +44327,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bEnablePM",
@@ -44340,8 +44337,8 @@
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-1600",
-   "self_type" : "type-1600",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2329",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -44357,13 +44354,13 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -44379,7 +44376,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44389,7 +44386,7 @@
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-1374"
+     "referenced_type" : "type-1564"
     },
     {
      "field_name" : "nDataSize",
@@ -44399,13 +44396,13 @@
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1375",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1576",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -44421,7 +44418,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44436,13 +44433,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-1587"
+     "referenced_type" : "type-2316"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2333",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
@@ -44453,13 +44450,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-1587"
+     "referenced_type" : "type-2316"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-1602",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2331",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -44475,7 +44472,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44485,13 +44482,13 @@
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-1386"
+     "referenced_type" : "type-1604"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-1387",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1610",
+   "self_type" : "type-1610",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -44507,18 +44504,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "cRole",
      "field_offset" : 64,
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1528"
     }
    ],
    "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
    "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-1527",
+   "self_type" : "type-1527",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
@@ -44534,7 +44531,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "hPipe",
@@ -44544,8 +44541,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-1616",
-   "self_type" : "type-1616",
+   "referenced_type" : "type-2345",
+   "self_type" : "type-2345",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
@@ -44561,18 +44558,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-2344",
+   "self_type" : "type-2344",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTURITYPE"
@@ -44588,7 +44585,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44598,18 +44595,18 @@
     {
      "field_name" : "eUnitType",
      "field_offset" : 96,
-     "referenced_type" : "type-1508"
+     "referenced_type" : "type-2237"
     },
     {
      "field_name" : "eEncapsulationType",
      "field_offset" : 128,
-     "referenced_type" : "type-1509"
+     "referenced_type" : "type-2238"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
    "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-1510",
-   "self_type" : "type-1510",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2239",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DATAUNITTYPE"
@@ -44625,7 +44622,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44640,8 +44637,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-1490",
-   "self_type" : "type-1490",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2219",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
@@ -44657,7 +44654,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44667,7 +44664,7 @@
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-1519"
+     "referenced_type" : "type-2248"
     },
     {
      "field_name" : "bCenterStatus",
@@ -44717,8 +44714,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1520",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2249",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -44734,7 +44731,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44754,8 +44751,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-1505",
-   "self_type" : "type-1505",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2234",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -44771,7 +44768,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44786,8 +44783,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1565",
+   "referenced_type" : "type-2294",
+   "self_type" : "type-2294",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
@@ -44803,7 +44800,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bAllKeys",
@@ -44813,7 +44810,7 @@
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-1618"
+     "referenced_type" : "type-2347"
     },
     {
      "field_name" : "nKeySizeUsed",
@@ -44823,7 +44820,7 @@
     {
      "field_name" : "nKey",
      "field_offset" : 160,
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1528"
     },
     {
      "field_name" : "nLanguageCountrySizeUsed",
@@ -44833,7 +44830,7 @@
     {
      "field_name" : "nLanguageCountry",
      "field_offset" : 1216,
-     "referenced_type" : "type-1372"
+     "referenced_type" : "type-1528"
     },
     {
      "field_name" : "bEnabled",
@@ -44843,8 +44840,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-1628",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2357",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -44860,7 +44857,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44870,7 +44867,7 @@
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-1352"
+     "referenced_type" : "type-1458"
     },
     {
      "field_name" : "nBufferCountActual",
@@ -44900,12 +44897,12 @@
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-2334"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-1607"
+     "referenced_type" : "type-2336"
     },
     {
      "field_name" : "bBuffersContiguous",
@@ -44920,8 +44917,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2335",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -44932,27 +44929,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-1390"
+     "referenced_type" : "type-1620"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-1522"
+     "referenced_type" : "type-2251"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-1571"
+     "referenced_type" : "type-2300"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-1602"
+     "referenced_type" : "type-2331"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h:95:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h:95:5",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h:95:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h:95:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h:95:5)"
@@ -44968,7 +44965,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -44988,13 +44985,13 @@
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-1484"
+     "referenced_type" : "type-2213"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-1496",
-   "self_type" : "type-1496",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2225",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -45010,18 +45007,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-1609"
+     "referenced_type" : "type-2338"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2339",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
@@ -45037,18 +45034,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-1611"
+     "referenced_type" : "type-2340"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1612",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2341",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONTYPE"
@@ -45064,7 +45061,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45079,8 +45076,8 @@
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1608",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -45096,7 +45093,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPorts",
@@ -45111,8 +45108,8 @@
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1588",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -45128,7 +45125,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nGroupPriority",
@@ -45143,8 +45140,8 @@
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-1523",
+   "self_type" : "type-1523",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -45160,7 +45157,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bResourceConcealmentForbidden",
@@ -45170,8 +45167,8 @@
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-1617",
-   "self_type" : "type-1617",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2346",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
@@ -45187,18 +45184,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-1593"
+     "referenced_type" : "type-2322"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-1599",
-   "self_type" : "type-1599",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
@@ -45214,12 +45211,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-1594"
+     "referenced_type" : "type-2323"
     },
     {
      "field_name" : "nStartTime",
@@ -45239,8 +45236,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-1598",
-   "self_type" : "type-1598",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2327",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -45256,7 +45253,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45281,8 +45278,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1595",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
@@ -45298,7 +45295,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "xScale",
@@ -45308,8 +45305,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-1597",
-   "self_type" : "type-1597",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2326",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
@@ -45325,18 +45322,18 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-1588"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-1589",
-   "self_type" : "type-1589",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2318",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -45352,7 +45349,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45367,8 +45364,8 @@
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2319",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -45384,7 +45381,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nClientPrivate",
@@ -45394,7 +45391,7 @@
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-1591"
+     "referenced_type" : "type-2320"
     },
     {
      "field_name" : "nMediaTimestamp",
@@ -45419,13 +45416,13 @@
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-1594"
+     "referenced_type" : "type-2323"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-1596",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2325",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -45441,13 +45438,13 @@
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-1386"
+     "referenced_type" : "type-1604"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1615",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -45458,7 +45455,7 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-1360"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nVersion",
@@ -45468,8 +45465,8 @@
    "linker_set_key" : "OMX_VERSIONTYPE",
    "name" : "OMX_VERSIONTYPE",
    "record_kind" : "union",
-   "referenced_type" : "type-1359",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-1480",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_VERSIONTYPE"
@@ -45501,8 +45498,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
    "name" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1481",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_VERSIONTYPE::(anonymous struct at frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h:376:5)"
@@ -45518,7 +45515,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45538,8 +45535,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-1568",
-   "self_type" : "type-1568",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2297",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -45555,7 +45552,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45570,8 +45567,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-1558",
-   "self_type" : "type-1558",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
@@ -45587,7 +45584,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45602,8 +45599,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-1569",
-   "self_type" : "type-1569",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -45619,7 +45616,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45639,13 +45636,13 @@
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-1566"
+     "referenced_type" : "type-2295"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-1567",
-   "self_type" : "type-1567",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2296",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
@@ -45661,7 +45658,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45726,12 +45723,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-1552"
+     "referenced_type" : "type-2281"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-1554"
+     "referenced_type" : "type-2283"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -45786,13 +45783,13 @@
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-1555"
+     "referenced_type" : "type-2284"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -45808,7 +45805,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45818,17 +45815,17 @@
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-1526"
+     "referenced_type" : "type-2255"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-1528"
+     "referenced_type" : "type-2257"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-1527",
-   "self_type" : "type-1527",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2256",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -45850,8 +45847,8 @@
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5) at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1528",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE::(anonymous union at frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h:269:5)"
@@ -45867,7 +45864,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45902,8 +45899,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
    "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-1534",
-   "self_type" : "type-1534",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
@@ -45919,7 +45916,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -45939,12 +45936,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-1536"
+     "referenced_type" : "type-2265"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-1537"
+     "referenced_type" : "type-2266"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
@@ -45974,8 +45971,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -45991,7 +45988,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46001,7 +45998,7 @@
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-1532"
+     "referenced_type" : "type-2261"
     },
     {
      "field_name" : "nAirMBs",
@@ -46021,8 +46018,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-1533",
-   "self_type" : "type-1533",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -46038,7 +46035,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46048,7 +46045,7 @@
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-1530"
+     "referenced_type" : "type-2259"
     },
     {
      "field_name" : "bUnrestrictedMVs",
@@ -46073,8 +46070,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-1531",
-   "self_type" : "type-1531",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
@@ -46090,7 +46087,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46110,18 +46107,18 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-1541"
+     "referenced_type" : "type-2270"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-1542"
+     "referenced_type" : "type-2271"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-1543",
-   "self_type" : "type-1543",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -46137,7 +46134,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46192,12 +46189,12 @@
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-1544"
+     "referenced_type" : "type-2273"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-1545"
+     "referenced_type" : "type-2274"
     },
     {
      "field_name" : "nAllowedPictureTypes",
@@ -46217,8 +46214,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1546",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -46234,7 +46231,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46249,12 +46246,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-1521"
+     "referenced_type" : "type-2250"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-1472"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "xFramerate",
@@ -46264,8 +46261,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-1523",
-   "self_type" : "type-1523",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2252",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -46281,7 +46278,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46306,8 +46303,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1557",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -46323,7 +46320,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46348,8 +46345,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1524",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2253",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -46365,7 +46362,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46375,7 +46372,7 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-1549"
+     "referenced_type" : "type-2278"
     },
     {
      "field_name" : "nBitsPerPixel",
@@ -46430,8 +46427,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-1551",
-   "self_type" : "type-1551",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2280",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -46447,7 +46444,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46492,8 +46489,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-1535",
-   "self_type" : "type-1535",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -46509,7 +46506,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46539,8 +46536,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1525",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
@@ -46556,7 +46553,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -46566,13 +46563,13 @@
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-1547"
+     "referenced_type" : "type-2276"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-1548",
-   "self_type" : "type-1548",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2277",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -46628,12 +46625,12 @@
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-1521"
+     "referenced_type" : "type-2250"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 384,
-     "referenced_type" : "type-1472"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "pNativeWindow",
@@ -46643,8 +46640,8 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1522",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2251",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
@@ -46716,8 +46713,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-1553",
-   "self_type" : "type-1553",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2282",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -47477,9 +47474,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -48828,7 +48822,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2950"
+     "referenced_type" : "type-1496"
     },
     {
      "referenced_type" : "type-50"
@@ -48837,11 +48831,11 @@
    "linker_set_key" : "android::BpInterface<android::IConsumerListener>",
    "name" : "android::BpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-2949",
-   "self_type" : "type-2949",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-2951" ],
+   "template_args" : [ "type-1497" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -48875,9 +48869,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -49000,7 +48991,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3062"
+     "referenced_type" : "type-1626"
     },
     {
      "referenced_type" : "type-50"
@@ -49009,11 +49000,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-3061",
-   "self_type" : "type-3061",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1625",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-3063" ],
+   "template_args" : [ "type-1627" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -49205,7 +49196,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3663"
+     "referenced_type" : "type-4321"
     },
     {
      "referenced_type" : "type-50"
@@ -49214,11 +49205,11 @@
    "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer>",
    "name" : "android::BpInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-3662",
-   "self_type" : "type-3662",
+   "referenced_type" : "type-4320",
+   "self_type" : "type-4320",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-3664" ],
+   "template_args" : [ "type-4322" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -49434,7 +49425,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3823"
+     "referenced_type" : "type-4483"
     },
     {
      "referenced_type" : "type-50"
@@ -49443,11 +49434,11 @@
    "linker_set_key" : "android::BpInterface<android::IProducerListener>",
    "name" : "android::BpInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-3822",
-   "self_type" : "type-3822",
+   "referenced_type" : "type-4482",
+   "self_type" : "type-4482",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-3824" ],
+   "template_args" : [ "type-4484" ],
    "unique_id" : "_ZTSN7android11BpInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -49711,28 +49702,28 @@
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-1703"
+     "referenced_type" : "type-2431"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-1704"
+     "referenced_type" : "type-2432"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-1705"
+     "referenced_type" : "type-2433"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-1706"
+     "referenced_type" : "type-2434"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1702",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -49751,8 +49742,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-1975",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-2692",
+   "self_type" : "type-2692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -49845,7 +49836,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -49870,8 +49861,8 @@
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-1700",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2428",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
@@ -49887,7 +49878,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -49917,13 +49908,13 @@
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-1702"
+     "referenced_type" : "type-2430"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-1701",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -49939,12 +49930,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-1472"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "nFrameWidth",
@@ -49974,13 +49965,13 @@
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-1695"
+     "referenced_type" : "type-2423"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -49996,12 +49987,12 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-1472"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "nFrameWidth",
@@ -50031,13 +50022,13 @@
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-1689"
+     "referenced_type" : "type-2417"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-1688",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -50053,7 +50044,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -50073,13 +50064,13 @@
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-1376"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-1714",
-   "self_type" : "type-1714",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -50095,7 +50086,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -50105,13 +50096,13 @@
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-1709"
+     "referenced_type" : "type-2437"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1708",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
@@ -50127,7 +50118,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -50142,8 +50133,8 @@
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-1669",
-   "self_type" : "type-1669",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2397",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
@@ -50363,7 +50354,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -50378,8 +50369,8 @@
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-1686",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -50725,17 +50716,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-1710"
+     "referenced_type" : "type-2438"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-1711"
+     "referenced_type" : "type-2439"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-1709",
-   "self_type" : "type-1709",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -50746,15 +50737,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-1712"
+     "referenced_type" : "type-2440"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::HDRStaticInfo::(anonymous union at frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h:216:5) at frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h:216:5",
    "name" : "android::HDRStaticInfo::(anonymous union at frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h:216:5) at frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h:216:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1711",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -50775,8 +50766,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1713",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -50787,22 +50778,22 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-1713"
+     "referenced_type" : "type-2441"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-1713"
+     "referenced_type" : "type-2441"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-1713"
+     "referenced_type" : "type-2441"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-1713"
+     "referenced_type" : "type-2441"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
@@ -50827,8 +50818,8 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -51287,17 +51278,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-2810"
+     "referenced_type" : "type-1355"
     }
    ],
    "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "name" : "android::KeyedVector<android::String16, android::sp<android::hardware::IBinder> >",
    "record_kind" : "class",
-   "referenced_type" : "type-2822",
-   "self_type" : "type-2822",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1367",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-1240", "type-2823" ],
+   "template_args" : [ "type-1240", "type-1368" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -51523,17 +51514,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-1625"
+     "referenced_type" : "type-2354"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-1624",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-1626" ],
+   "template_args" : [ "type-2355" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
@@ -51944,7 +51935,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-1690"
+     "referenced_type" : "type-2418"
     },
     {
      "field_name" : "mNumPlanes",
@@ -51969,13 +51960,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-1691"
+     "referenced_type" : "type-2419"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1689",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2417",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -51986,7 +51977,7 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-1696"
+     "referenced_type" : "type-2424"
     },
     {
      "field_name" : "mNumPlanes",
@@ -52016,13 +52007,13 @@
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-1697"
+     "referenced_type" : "type-2425"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1695",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -52058,8 +52049,8 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -52095,8 +52086,8 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-1692",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -52175,8 +52166,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-1667",
-   "self_type" : "type-1667",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2395",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -52388,17 +52379,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-2963"
+     "referenced_type" : "type-1513"
     }
    ],
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem>",
    "name" : "android::Parcel::FlattenableHelper<android::BufferItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-2968",
-   "self_type" : "type-2968",
+   "referenced_type" : "type-1517",
+   "self_type" : "type-1517",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-2969" ],
+   "template_args" : [ "type-1518" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_10BufferItemEEE",
    "vtable_components" :
    [
@@ -52437,17 +52428,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-3079"
+     "referenced_type" : "type-1648"
     }
    ],
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence>",
    "name" : "android::Parcel::FlattenableHelper<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-3090",
-   "self_type" : "type-3090",
+   "referenced_type" : "type-1659",
+   "self_type" : "type-1659",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3091" ],
+   "template_args" : [ "type-1660" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_5FenceEEE",
    "vtable_components" :
    [
@@ -52486,17 +52477,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-3667"
+     "referenced_type" : "type-4325"
     }
    ],
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
    "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-3673",
-   "self_type" : "type-3673",
+   "referenced_type" : "type-4331",
+   "self_type" : "type-4331",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3674" ],
+   "template_args" : [ "type-4332" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE",
    "vtable_components" :
    [
@@ -52535,17 +52526,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-3078"
+     "referenced_type" : "type-1647"
     }
    ],
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer>",
    "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-3085",
-   "self_type" : "type-3085",
+   "referenced_type" : "type-1654",
+   "self_type" : "type-1654",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3086" ],
+   "template_args" : [ "type-1655" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE",
    "vtable_components" :
    [
@@ -52584,17 +52575,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-3666"
+     "referenced_type" : "type-4324"
     }
    ],
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
    "record_kind" : "class",
-   "referenced_type" : "type-3678",
-   "self_type" : "type-3678",
+   "referenced_type" : "type-4336",
+   "self_type" : "type-4336",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3679" ],
+   "template_args" : [ "type-4337" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE",
    "vtable_components" :
    [
@@ -52633,17 +52624,17 @@
      "access" : "private",
      "field_name" : "val",
      "field_offset" : 64,
-     "referenced_type" : "type-3668"
+     "referenced_type" : "type-4326"
     }
    ],
    "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
    "record_kind" : "class",
-   "referenced_type" : "type-3683",
-   "self_type" : "type-3683",
+   "referenced_type" : "type-4341",
+   "self_type" : "type-4341",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
-   "template_args" : [ "type-3684" ],
+   "template_args" : [ "type-4342" ],
    "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE",
    "vtable_components" :
    [
@@ -52788,7 +52779,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -52813,8 +52804,8 @@
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-1680",
-   "self_type" : "type-1680",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2408",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -52830,7 +52821,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bEnable",
@@ -52840,8 +52831,8 @@
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1687",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -53187,8 +53178,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -53222,8 +53213,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::ElementIsPointer<0, const BufferItem &>",
    "name" : "android::SafeBnInterface<IConsumerListener>::ElementIsPointer<0, const BufferItem &>",
-   "referenced_type" : "type-3011",
-   "self_type" : "type-3011",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1562",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE16ElementIsPointerILm0EJRKNS_10BufferItemEEEE"
@@ -53241,8 +53232,8 @@
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3012",
-   "self_type" : "type-3012",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1563",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -53260,8 +53251,8 @@
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3016",
-   "self_type" : "type-3016",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1568",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -53270,8 +53261,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-3020",
-   "self_type" : "type-3020",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1572",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -53280,8 +53271,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<const BufferItem &> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<const BufferItem &> >",
-   "referenced_type" : "type-3021",
-   "self_type" : "type-3021",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1573",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
@@ -53290,52 +53281,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<> >",
-   "referenced_type" : "type-3005",
-   "self_type" : "type-3005",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1556",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3006" ],
+   "template_args" : [ "type-1557" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12RawConverterINSt3__15tupleIJEEEJS6_EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<const BufferItem &> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<const BufferItem &> >",
-   "referenced_type" : "type-3007",
-   "self_type" : "type-3007",
+   "referenced_type" : "type-1558",
+   "self_type" : "type-1558",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3008" ],
+   "template_args" : [ "type-1559" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJRKNS_10BufferItemEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<BufferItem>, tuple<> >",
    "name" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<BufferItem>, tuple<> >",
-   "referenced_type" : "type-3009",
-   "self_type" : "type-3009",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1560",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3010" ],
+   "template_args" : [ "type-1561" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12RawConverterINSt3__15tupleIJNS_10BufferItemEEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::RemoveFirst<std::tuple<const BufferItem &>>",
    "name" : "android::SafeBnInterface<IConsumerListener>::RemoveFirst<std::tuple<const BufferItem &>>",
-   "referenced_type" : "type-3003",
-   "self_type" : "type-3003",
+   "referenced_type" : "type-1554",
+   "self_type" : "type-1554",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3004" ],
+   "template_args" : [ "type-1555" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11RemoveFirstINSt3__15tupleIJRKNS_10BufferItemEEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, BufferItem *, long, unsigned long>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, BufferItem *, long, unsigned long>",
-   "referenced_type" : "type-3415",
-   "self_type" : "type-3415",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2022",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPNS_10BufferItemElmEEE"
@@ -53344,8 +53335,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, android_dataspace_t>",
-   "referenced_type" : "type-3430",
-   "self_type" : "type-3430",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJ19android_dataspace_tEEE"
@@ -53354,8 +53345,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-3435",
-   "self_type" : "type-3435",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2044",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -53364,8 +53355,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool>",
-   "referenced_type" : "type-3432",
-   "self_type" : "type-3432",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2041",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJbEEE"
@@ -53374,8 +53365,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &, String8 *>",
-   "referenced_type" : "type-3437",
-   "self_type" : "type-3437",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2047",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJRKNS_7String8EPS4_EEE"
@@ -53384,8 +53375,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &>",
-   "referenced_type" : "type-3429",
-   "self_type" : "type-3429",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2038",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJRKNS_7String8EEEE"
@@ -53394,8 +53385,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-3424",
-   "self_type" : "type-3424",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2032",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -53404,8 +53395,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-3419",
-   "self_type" : "type-3419",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2027",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -53414,8 +53405,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long, const sp<Fence> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long, const sp<Fence> &>",
-   "referenced_type" : "type-3421",
-   "self_type" : "type-3421",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2029",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJimRKNS_2spINS_5FenceEEEEEE"
@@ -53424,8 +53415,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int>",
-   "referenced_type" : "type-3418",
-   "self_type" : "type-3418",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2026",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJiEEE"
@@ -53434,8 +53425,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, sp<NativeHandle> *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, sp<NativeHandle> *>",
-   "referenced_type" : "type-3434",
-   "self_type" : "type-3434",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2043",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPNS_2spINS_12NativeHandleEEEEEE"
@@ -53444,8 +53435,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int, unsigned int>",
-   "referenced_type" : "type-3427",
-   "self_type" : "type-3427",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2036",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJjjEEE"
@@ -53454,8 +53445,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int>",
-   "referenced_type" : "type-3433",
-   "self_type" : "type-3433",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2042",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJjEEE"
@@ -53464,8 +53455,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long *>",
-   "referenced_type" : "type-3426",
-   "self_type" : "type-3426",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2034",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPmEEE"
@@ -53474,8 +53465,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long>",
-   "referenced_type" : "type-3431",
-   "self_type" : "type-3431",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2040",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJmEEE"
@@ -53484,8 +53475,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long, unsigned long>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long, unsigned long>",
-   "referenced_type" : "type-3416",
-   "self_type" : "type-3416",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2023",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJPNS_10BufferItemElmEEE"
@@ -53494,8 +53485,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, bool, vector<Segment, allocator<Segment> > *>",
-   "referenced_type" : "type-3436",
-   "self_type" : "type-3436",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2045",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
@@ -53504,8 +53495,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const String8 &, String8 *>",
-   "referenced_type" : "type-3438",
-   "self_type" : "type-3438",
+   "referenced_type" : "type-2048",
+   "self_type" : "type-2048",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJRKNS_7String8EPS4_EEE"
@@ -53514,8 +53505,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, const sp<IConsumerListener> &, bool>",
-   "referenced_type" : "type-3425",
-   "self_type" : "type-3425",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2033",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
@@ -53524,8 +53515,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int *, const sp<GraphicBuffer> &>",
-   "referenced_type" : "type-3420",
-   "self_type" : "type-3420",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2028",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
@@ -53534,8 +53525,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long, const sp<Fence> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long, const sp<Fence> &>",
-   "referenced_type" : "type-3422",
-   "self_type" : "type-3422",
+   "referenced_type" : "type-2030",
+   "self_type" : "type-2030",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJimRKNS_2spINS_5FenceEEEEEE"
@@ -53544,8 +53535,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, unsigned int, unsigned int>",
-   "referenced_type" : "type-3428",
-   "self_type" : "type-3428",
+   "referenced_type" : "type-2037",
+   "self_type" : "type-2037",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJjjEEE"
@@ -53554,8 +53545,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long, unsigned long>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long, unsigned long>",
-   "referenced_type" : "type-3417",
-   "self_type" : "type-3417",
+   "referenced_type" : "type-2025",
+   "self_type" : "type-2025",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm2EJPNS_10BufferItemElmEEE"
@@ -53564,8 +53555,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long, const sp<Fence> &>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long, const sp<Fence> &>",
-   "referenced_type" : "type-3423",
-   "self_type" : "type-3423",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2031",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm2EJimRKNS_2spINS_5FenceEEEEEE"
@@ -53583,8 +53574,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3459",
-   "self_type" : "type-3459",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2071",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
@@ -53602,8 +53593,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long, unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long, unsigned long> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3439",
-   "self_type" : "type-3439",
+   "referenced_type" : "type-2049",
+   "self_type" : "type-2049",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_10BufferItemElmEEEEEE"
@@ -53621,8 +53612,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3476",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2088",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -53640,8 +53631,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3495",
-   "self_type" : "type-3495",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2109",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -53659,8 +53650,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3482",
-   "self_type" : "type-3482",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2095",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbEEEEEE"
@@ -53678,8 +53669,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3499",
-   "self_type" : "type-3499",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2114",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -53697,8 +53688,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3472",
-   "self_type" : "type-3472",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2084",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -53716,8 +53707,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const sp<IConsumerListener> &, bool> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3455",
-   "self_type" : "type-3455",
+   "referenced_type" : "type-2066",
+   "self_type" : "type-2066",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -53735,8 +53726,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int *, const sp<GraphicBuffer> &> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3447",
-   "self_type" : "type-3447",
+   "referenced_type" : "type-2058",
+   "self_type" : "type-2058",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -53754,8 +53745,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long, const sp<Fence> &> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3451",
-   "self_type" : "type-3451",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2062",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEEEE"
@@ -53773,8 +53764,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3443",
-   "self_type" : "type-3443",
+   "referenced_type" : "type-2053",
+   "self_type" : "type-2053",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiEEEEEE"
@@ -53792,8 +53783,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3491",
-   "self_type" : "type-3491",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2105",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -53811,8 +53802,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int, unsigned int> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3468",
-   "self_type" : "type-3468",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2080",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjjEEEEEE"
@@ -53830,8 +53821,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3486",
-   "self_type" : "type-3486",
+   "referenced_type" : "type-2099",
+   "self_type" : "type-2099",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjEEEEEE"
@@ -53849,8 +53840,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long *> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3463",
-   "self_type" : "type-3463",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2075",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPmEEEEEE"
@@ -53868,8 +53859,8 @@
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3480",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2093",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJmEEEEEE"
@@ -53878,8 +53869,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
-   "referenced_type" : "type-3508",
-   "self_type" : "type-3508",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2123",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
@@ -53888,8 +53879,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long, unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long, unsigned long> >",
-   "referenced_type" : "type-3503",
-   "self_type" : "type-3503",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2118",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_10BufferItemElmEEEEEE"
@@ -53898,8 +53889,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<android_dataspace_t> >",
-   "referenced_type" : "type-3512",
-   "self_type" : "type-3512",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2128",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -53908,8 +53899,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-3517",
-   "self_type" : "type-3517",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2133",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -53918,8 +53909,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool> >",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3514",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbEEEEEE"
@@ -53928,8 +53919,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-3518",
-   "self_type" : "type-3518",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2134",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -53938,8 +53929,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &> >",
-   "referenced_type" : "type-3511",
-   "self_type" : "type-3511",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -53948,8 +53939,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-3507",
-   "self_type" : "type-3507",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -53958,8 +53949,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-3505",
-   "self_type" : "type-3505",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2120",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -53968,8 +53959,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long, const sp<Fence> &> >",
-   "referenced_type" : "type-3506",
-   "self_type" : "type-3506",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2121",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEEEE"
@@ -53978,8 +53969,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int> >",
-   "referenced_type" : "type-3504",
-   "self_type" : "type-3504",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2119",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiEEEEEE"
@@ -53988,8 +53979,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<sp<NativeHandle> *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<sp<NativeHandle> *> >",
-   "referenced_type" : "type-3516",
-   "self_type" : "type-3516",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -53998,8 +53989,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-3510",
-   "self_type" : "type-3510",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2126",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjjEEEEEE"
@@ -54008,8 +53999,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int> >",
-   "referenced_type" : "type-3515",
-   "self_type" : "type-3515",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2131",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjEEEEEE"
@@ -54018,8 +54009,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long *> >",
-   "referenced_type" : "type-3509",
-   "self_type" : "type-3509",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2125",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPmEEEEEE"
@@ -54028,8 +54019,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long> >",
-   "referenced_type" : "type-3513",
-   "self_type" : "type-3513",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2129",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJmEEEEEE"
@@ -54046,8 +54037,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
-   "referenced_type" : "type-3529",
-   "self_type" : "type-3529",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJEEEEEE"
@@ -54064,8 +54055,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long, unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long, unsigned long> >",
-   "referenced_type" : "type-3519",
-   "self_type" : "type-3519",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_10BufferItemElmEEEEEE"
@@ -54082,8 +54073,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> >",
-   "referenced_type" : "type-3537",
-   "self_type" : "type-3537",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2155",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
@@ -54100,8 +54091,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-3547",
-   "self_type" : "type-3547",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2166",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
@@ -54118,8 +54109,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
-   "referenced_type" : "type-3541",
-   "self_type" : "type-3541",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbEEEEEE"
@@ -54136,8 +54127,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-3549",
-   "self_type" : "type-3549",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2169",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
@@ -54154,8 +54145,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> >",
-   "referenced_type" : "type-3535",
-   "self_type" : "type-3535",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
@@ -54172,8 +54163,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-3527",
-   "self_type" : "type-3527",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2144",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
@@ -54190,8 +54181,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-3523",
-   "self_type" : "type-3523",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
@@ -54208,8 +54199,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long, const sp<Fence> &> >",
-   "referenced_type" : "type-3525",
-   "self_type" : "type-3525",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2142",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEEEE"
@@ -54226,8 +54217,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
-   "referenced_type" : "type-3521",
-   "self_type" : "type-3521",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2138",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiEEEEEE"
@@ -54244,8 +54235,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> >",
-   "referenced_type" : "type-3545",
-   "self_type" : "type-3545",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2164",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
@@ -54262,8 +54253,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-3533",
-   "self_type" : "type-3533",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjjEEEEEE"
@@ -54280,8 +54271,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> >",
-   "referenced_type" : "type-3543",
-   "self_type" : "type-3543",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjEEEEEE"
@@ -54298,8 +54289,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long *> >",
-   "referenced_type" : "type-3531",
-   "self_type" : "type-3531",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2149",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPmEEEEEE"
@@ -54316,8 +54307,8 @@
    ],
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long> >",
-   "referenced_type" : "type-3539",
-   "self_type" : "type-3539",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2158",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJmEEEEEE"
@@ -54326,660 +54317,660 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<> >",
-   "referenced_type" : "type-3368",
-   "self_type" : "type-3368",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1972",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3369" ],
+   "template_args" : [ "type-1973" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJS6_EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<BufferItem *, long, unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<BufferItem *, long, unsigned long> >",
-   "referenced_type" : "type-3335",
-   "self_type" : "type-3335",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1937",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3336" ],
+   "template_args" : [ "type-1938" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPNS_10BufferItemElmEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<android_dataspace_t> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<android_dataspace_t> >",
-   "referenced_type" : "type-3384",
-   "self_type" : "type-3384",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1989",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3385" ],
+   "template_args" : [ "type-1990" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJ19android_dataspace_tEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-3403",
-   "self_type" : "type-3403",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2009",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3404" ],
+   "template_args" : [ "type-2010" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS9_EEEEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<bool> >",
-   "referenced_type" : "type-3391",
-   "self_type" : "type-3391",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1996",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3392" ],
+   "template_args" : [ "type-1997" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJbEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-3409",
-   "self_type" : "type-3409",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2016",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3410" ],
+   "template_args" : [ "type-2017" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJRKNS_7String8EPS7_EEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<const String8 &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<const String8 &> >",
-   "referenced_type" : "type-3380",
-   "self_type" : "type-3380",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1985",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3381" ],
+   "template_args" : [ "type-1986" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJRKNS_7String8EEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-3362",
-   "self_type" : "type-3362",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1965",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3363" ],
+   "template_args" : [ "type-1966" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-3347",
-   "self_type" : "type-3347",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1950",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3348" ],
+   "template_args" : [ "type-1951" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int, unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int, unsigned long, const sp<Fence> &> >",
-   "referenced_type" : "type-3353",
-   "self_type" : "type-3353",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1956",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3354" ],
+   "template_args" : [ "type-1957" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJimRKNS_2spINS_5FenceEEEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int> >",
-   "referenced_type" : "type-3343",
-   "self_type" : "type-3343",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1945",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3344" ],
+   "template_args" : [ "type-1946" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJiEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<sp<NativeHandle> *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<sp<NativeHandle> *> >",
-   "referenced_type" : "type-3399",
-   "self_type" : "type-3399",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2005",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3400" ],
+   "template_args" : [ "type-2006" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPNS_2spINS_12NativeHandleEEEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-3374",
-   "self_type" : "type-3374",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1978",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3375" ],
+   "template_args" : [ "type-1979" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJjjEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned int> >",
-   "referenced_type" : "type-3395",
-   "self_type" : "type-3395",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-2000",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3396" ],
+   "template_args" : [ "type-2001" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJjEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long *> >",
-   "referenced_type" : "type-3370",
-   "self_type" : "type-3370",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1974",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3371" ],
+   "template_args" : [ "type-1975" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPmEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long> >",
-   "referenced_type" : "type-3389",
-   "self_type" : "type-3389",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1994",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3390" ],
+   "template_args" : [ "type-1995" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJmEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long, unsigned long>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long, unsigned long>, tuple<> >",
-   "referenced_type" : "type-3341",
-   "self_type" : "type-3341",
+   "referenced_type" : "type-1943",
+   "self_type" : "type-1943",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3342" ],
+   "template_args" : [ "type-1944" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemElmEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long>, tuple<unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long>, tuple<unsigned long> >",
-   "referenced_type" : "type-3339",
-   "self_type" : "type-3339",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3340" ],
+   "template_args" : [ "type-1942" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemElEEEJNS5_IJmEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem>, tuple<long, unsigned long> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem>, tuple<long, unsigned long> >",
-   "referenced_type" : "type-3337",
-   "self_type" : "type-3337",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1939",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3338" ],
+   "template_args" : [ "type-1940" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemEEEEJNS5_IJlmEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<String8, String8>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<String8, String8>, tuple<> >",
-   "referenced_type" : "type-3413",
-   "self_type" : "type-3413",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3414" ],
+   "template_args" : [ "type-2021" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_7String8ES6_EEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<String8>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<String8>, tuple<> >",
-   "referenced_type" : "type-3382",
-   "self_type" : "type-3382",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1987",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3383" ],
+   "template_args" : [ "type-1988" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_7String8EEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<String8>, tuple<String8 *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<String8>, tuple<String8 *> >",
-   "referenced_type" : "type-3411",
-   "self_type" : "type-3411",
+   "referenced_type" : "type-2018",
+   "self_type" : "type-2018",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3412" ],
+   "template_args" : [ "type-2019" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_7String8EEEEJNS5_IJPS6_EEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<android_dataspace_t>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<android_dataspace_t>, tuple<> >",
-   "referenced_type" : "type-3387",
-   "self_type" : "type-3387",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1992",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3388" ],
+   "template_args" : [ "type-1993" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJ19android_dataspace_tEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<bool, vector<Segment, allocator<Segment> > >, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<bool, vector<Segment, allocator<Segment> > >, tuple<> >",
-   "referenced_type" : "type-3407",
-   "self_type" : "type-3407",
+   "referenced_type" : "type-2014",
+   "self_type" : "type-2014",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3408" ],
+   "template_args" : [ "type-2015" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJbNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<bool>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<bool>, tuple<> >",
-   "referenced_type" : "type-3393",
-   "self_type" : "type-3393",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1998",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3394" ],
+   "template_args" : [ "type-1999" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJbEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<bool>, tuple<vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<bool>, tuple<vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-3405",
-   "self_type" : "type-3405",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3406" ],
+   "template_args" : [ "type-2012" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJbEEEJNS5_IJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS9_EEEEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, sp<GraphicBuffer> >, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, sp<GraphicBuffer> >, tuple<> >",
-   "referenced_type" : "type-3351",
-   "self_type" : "type-3351",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3352" ],
+   "template_args" : [ "type-1955" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiNS_2spINS_13GraphicBufferEEEEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long, sp<Fence> >, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long, sp<Fence> >, tuple<> >",
-   "referenced_type" : "type-3360",
-   "self_type" : "type-3360",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1963",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3361" ],
+   "template_args" : [ "type-1964" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJimNS_2spINS_5FenceEEEEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long>, tuple<const sp<Fence> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long>, tuple<const sp<Fence> &> >",
-   "referenced_type" : "type-3358",
-   "self_type" : "type-3358",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1961",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3359" ],
+   "template_args" : [ "type-1962" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJimEEEJNS5_IJRKNS_2spINS_5FenceEEEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<> >",
-   "referenced_type" : "type-3345",
-   "self_type" : "type-3345",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1948",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3346" ],
+   "template_args" : [ "type-1949" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-3349",
-   "self_type" : "type-3349",
+   "referenced_type" : "type-1952",
+   "self_type" : "type-1952",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3350" ],
+   "template_args" : [ "type-1953" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiEEEJNS5_IJRKNS_2spINS_13GraphicBufferEEEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<unsigned long, const sp<Fence> &> >",
-   "referenced_type" : "type-3356",
-   "self_type" : "type-3356",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1959",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3357" ],
+   "template_args" : [ "type-1960" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiEEEJNS5_IJmRKNS_2spINS_5FenceEEEEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<sp<IConsumerListener> >, tuple<bool> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<sp<IConsumerListener> >, tuple<bool> >",
-   "referenced_type" : "type-3364",
-   "self_type" : "type-3364",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1967",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3365" ],
+   "template_args" : [ "type-1968" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_2spINS_17IConsumerListenerEEEEEEJNS5_IJbEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<sp<IConsumerListener>, bool>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<sp<IConsumerListener>, bool>, tuple<> >",
-   "referenced_type" : "type-3366",
-   "self_type" : "type-3366",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1970",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3367" ],
+   "template_args" : [ "type-1971" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_2spINS_17IConsumerListenerEEEbEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<sp<NativeHandle> >, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<sp<NativeHandle> >, tuple<> >",
-   "referenced_type" : "type-3401",
-   "self_type" : "type-3401",
+   "referenced_type" : "type-2007",
+   "self_type" : "type-2007",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3402" ],
+   "template_args" : [ "type-2008" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_2spINS_12NativeHandleEEEEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned int, unsigned int>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned int, unsigned int>, tuple<> >",
-   "referenced_type" : "type-3378",
-   "self_type" : "type-3378",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1983",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3379" ],
+   "template_args" : [ "type-1984" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJjjEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned int>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned int>, tuple<> >",
-   "referenced_type" : "type-3397",
-   "self_type" : "type-3397",
+   "referenced_type" : "type-2003",
+   "self_type" : "type-2003",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3398" ],
+   "template_args" : [ "type-2004" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJjEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned int>, tuple<unsigned int> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned int>, tuple<unsigned int> >",
-   "referenced_type" : "type-3376",
-   "self_type" : "type-3376",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1981",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3377" ],
+   "template_args" : [ "type-1982" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJjEEEJS6_EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned long>, tuple<> >",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned long>, tuple<> >",
-   "referenced_type" : "type-3372",
-   "self_type" : "type-3372",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1976",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3373" ],
+   "template_args" : [ "type-1977" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJmEEEJNS5_IJEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<BufferItem *, long, unsigned long>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<BufferItem *, long, unsigned long>>",
-   "referenced_type" : "type-3293",
-   "self_type" : "type-3293",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1890",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3294" ],
+   "template_args" : [ "type-1891" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS_10BufferItemElmEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<String8 *>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<String8 *>>",
-   "referenced_type" : "type-3333",
-   "self_type" : "type-3333",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1934",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3334" ],
+   "template_args" : [ "type-1935" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS_7String8EEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<android_dataspace_t>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<android_dataspace_t>>",
-   "referenced_type" : "type-3323",
-   "self_type" : "type-3323",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3324" ],
+   "template_args" : [ "type-1924" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJ19android_dataspace_tEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<bool, vector<Segment, allocator<Segment> > *>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<bool, vector<Segment, allocator<Segment> > *>>",
-   "referenced_type" : "type-3327",
-   "self_type" : "type-3327",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1928",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3328" ],
+   "template_args" : [ "type-1929" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<bool>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<bool>>",
-   "referenced_type" : "type-3313",
-   "self_type" : "type-3313",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1912",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3314" ],
+   "template_args" : [ "type-1913" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJbEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const String8 &, String8 *>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const String8 &, String8 *>>",
-   "referenced_type" : "type-3331",
-   "self_type" : "type-3331",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1932",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3332" ],
+   "template_args" : [ "type-1933" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJRKNS_7String8EPS6_EEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const String8 &>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const String8 &>>",
-   "referenced_type" : "type-3321",
-   "self_type" : "type-3321",
+   "referenced_type" : "type-1921",
+   "self_type" : "type-1921",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3322" ],
+   "template_args" : [ "type-1922" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJRKNS_7String8EEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const sp<Fence> &>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const sp<Fence> &>>",
-   "referenced_type" : "type-3309",
-   "self_type" : "type-3309",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1908",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3310" ],
+   "template_args" : [ "type-1909" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJRKNS_2spINS_5FenceEEEEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const sp<GraphicBuffer> &>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const sp<GraphicBuffer> &>>",
-   "referenced_type" : "type-3303",
-   "self_type" : "type-3303",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1901",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3304" ],
+   "template_args" : [ "type-1902" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJRKNS_2spINS_13GraphicBufferEEEEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const sp<IConsumerListener> &, bool>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<const sp<IConsumerListener> &, bool>>",
-   "referenced_type" : "type-3311",
-   "self_type" : "type-3311",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1910",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3312" ],
+   "template_args" : [ "type-1911" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int *, const sp<GraphicBuffer> &>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int *, const sp<GraphicBuffer> &>>",
-   "referenced_type" : "type-3301",
-   "self_type" : "type-3301",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1899",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3302" ],
+   "template_args" : [ "type-1900" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int, unsigned long, const sp<Fence> &>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int, unsigned long, const sp<Fence> &>>",
-   "referenced_type" : "type-3305",
-   "self_type" : "type-3305",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1904",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3306" ],
+   "template_args" : [ "type-1905" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int>>",
-   "referenced_type" : "type-3299",
-   "self_type" : "type-3299",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1897",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3300" ],
+   "template_args" : [ "type-1898" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJiEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<long, unsigned long>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<long, unsigned long>>",
-   "referenced_type" : "type-3295",
-   "self_type" : "type-3295",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1893",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3296" ],
+   "template_args" : [ "type-1894" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJlmEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<sp<NativeHandle> *>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<sp<NativeHandle> *>>",
-   "referenced_type" : "type-3325",
-   "self_type" : "type-3325",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1926",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3326" ],
+   "template_args" : [ "type-1927" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned int, unsigned int>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned int, unsigned int>>",
-   "referenced_type" : "type-3317",
-   "self_type" : "type-3317",
+   "referenced_type" : "type-1917",
+   "self_type" : "type-1917",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3318" ],
+   "template_args" : [ "type-1918" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJjjEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned int>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned int>>",
-   "referenced_type" : "type-3319",
-   "self_type" : "type-3319",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1919",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3320" ],
+   "template_args" : [ "type-1920" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJjEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long *>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long *>>",
-   "referenced_type" : "type-3315",
-   "self_type" : "type-3315",
+   "referenced_type" : "type-1915",
+   "self_type" : "type-1915",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3316" ],
+   "template_args" : [ "type-1916" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPmEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long, const sp<Fence> &>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long, const sp<Fence> &>>",
-   "referenced_type" : "type-3307",
-   "self_type" : "type-3307",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1906",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3308" ],
+   "template_args" : [ "type-1907" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJmRKNS_2spINS_5FenceEEEEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long>>",
-   "referenced_type" : "type-3297",
-   "self_type" : "type-3297",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1895",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3298" ],
+   "template_args" : [ "type-1896" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJmEEEJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<vector<Segment, allocator<Segment> > *>>",
    "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<vector<Segment, allocator<Segment> > *>>",
-   "referenced_type" : "type-3329",
-   "self_type" : "type-3329",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1930",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3330" ],
+   "template_args" : [ "type-1931" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
@@ -55040,9 +55031,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -55618,525 +55606,525 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
    "name" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
-   "referenced_type" : "type-2994",
-   "self_type" : "type-2994",
+   "referenced_type" : "type-1545",
+   "self_type" : "type-1545",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2995", "type-2996" ],
+   "template_args" : [ "type-1546", "type-1547" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEE15ArgsMatchParamsINSt3__15tupleIJEEES6_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<const BufferItem &>, std::tuple<const BufferItem &> >",
    "name" : "android::SafeBpInterface<IConsumerListener>::ArgsMatchParams<std::tuple<const BufferItem &>, std::tuple<const BufferItem &> >",
-   "referenced_type" : "type-2997",
-   "self_type" : "type-2997",
+   "referenced_type" : "type-1548",
+   "self_type" : "type-1548",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2998", "type-2999" ],
+   "template_args" : [ "type-1549", "type-1550" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEE15ArgsMatchParamsINSt3__15tupleIJRKNS_10BufferItemEEEES9_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IConsumerListener>::DecayedElementsMatch<0, std::tuple<const BufferItem &>, std::tuple<const BufferItem &> >",
    "name" : "android::SafeBpInterface<IConsumerListener>::DecayedElementsMatch<0, std::tuple<const BufferItem &>, std::tuple<const BufferItem &> >",
-   "referenced_type" : "type-2991",
-   "self_type" : "type-2991",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1541",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2992", "type-2993" ],
+   "template_args" : [ "type-1542", "type-1543" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRKNS_10BufferItemEEEES9_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IConsumerListener>::IsPointerIfDecayed<const android::BufferItem &>",
    "name" : "android::SafeBpInterface<IConsumerListener>::IsPointerIfDecayed<const android::BufferItem &>",
-   "referenced_type" : "type-3000",
-   "self_type" : "type-3000",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1551",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2981" ],
+   "template_args" : [ "type-1533" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEE18IsPointerIfDecayedIRKNS_10BufferItemEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<>, std::tuple<> >",
-   "referenced_type" : "type-3233",
-   "self_type" : "type-3233",
+   "referenced_type" : "type-1817",
+   "self_type" : "type-1817",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3234", "type-3235" ],
+   "template_args" : [ "type-1818", "type-1819" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJEEES6_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<BufferItem *&, long &, unsigned long &>, std::tuple<BufferItem *, long, unsigned long> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<BufferItem *&, long &, unsigned long &>, std::tuple<BufferItem *, long, unsigned long> >",
-   "referenced_type" : "type-3218",
-   "self_type" : "type-3218",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1801",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3219", "type-3220" ],
+   "template_args" : [ "type-1802", "type-1803" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPNS_10BufferItemERlRmEEENS5_IJS7_lmEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<android_dataspace_t &>, std::tuple<android_dataspace_t> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<android_dataspace_t &>, std::tuple<android_dataspace_t> >",
-   "referenced_type" : "type-3245",
-   "self_type" : "type-3245",
+   "referenced_type" : "type-1830",
+   "self_type" : "type-1830",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3246", "type-3247" ],
+   "template_args" : [ "type-1831", "type-1832" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJR19android_dataspace_tEEENS5_IJS6_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<bool &, vector<Segment, allocator<Segment> > *&>, std::tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<bool &, vector<Segment, allocator<Segment> > *&>, std::tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-3260",
-   "self_type" : "type-3260",
+   "referenced_type" : "type-1847",
+   "self_type" : "type-1847",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3261", "type-3262" ],
+   "template_args" : [ "type-1848", "type-1849" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRbRPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS9_EEEEEEENS5_IJbSD_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<bool &>, std::tuple<bool> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<bool &>, std::tuple<bool> >",
-   "referenced_type" : "type-3251",
-   "self_type" : "type-3251",
+   "referenced_type" : "type-1837",
+   "self_type" : "type-1837",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3252", "type-3253" ],
+   "template_args" : [ "type-1838", "type-1839" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRbEEENS5_IJbEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<const String8 &, String8 *&>, std::tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<const String8 &, String8 *&>, std::tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-3263",
-   "self_type" : "type-3263",
+   "referenced_type" : "type-1850",
+   "self_type" : "type-1850",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3264", "type-3265" ],
+   "template_args" : [ "type-1851", "type-1852" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRKNS_7String8ERPS6_EEENS5_IJS8_S9_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<const String8 &>, std::tuple<const String8 &> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<const String8 &>, std::tuple<const String8 &> >",
-   "referenced_type" : "type-3242",
-   "self_type" : "type-3242",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1827",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3243", "type-3244" ],
+   "template_args" : [ "type-1828", "type-1829" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRKNS_7String8EEEES9_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<const sp<IConsumerListener> &, bool &>, std::tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<const sp<IConsumerListener> &, bool &>, std::tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-3230",
-   "self_type" : "type-3230",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1814",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3231", "type-3232" ],
+   "template_args" : [ "type-1815", "type-1816" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &, unsigned long &, const sp<Fence> &>, std::tuple<int, unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &, unsigned long &, const sp<Fence> &>, std::tuple<int, unsigned long, const sp<Fence> &> >",
-   "referenced_type" : "type-3227",
-   "self_type" : "type-3227",
+   "referenced_type" : "type-1811",
+   "self_type" : "type-1811",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3228", "type-3229" ],
+   "template_args" : [ "type-1812", "type-1813" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRiRmRKNS_2spINS_5FenceEEEEEENS5_IJimSC_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &>, std::tuple<int> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &>, std::tuple<int> >",
-   "referenced_type" : "type-3221",
-   "self_type" : "type-3221",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1804",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3222", "type-3223" ],
+   "template_args" : [ "type-1805", "type-1806" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRiEEENS5_IJiEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int *&, const sp<GraphicBuffer> &>, std::tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int *&, const sp<GraphicBuffer> &>, std::tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-3224",
-   "self_type" : "type-3224",
+   "referenced_type" : "type-1807",
+   "self_type" : "type-1807",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3225", "type-3226" ],
+   "template_args" : [ "type-1808", "type-1809" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPiRKNS_2spINS_13GraphicBufferEEEEEENS5_IJS6_SC_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<sp<NativeHandle> *&>, std::tuple<sp<NativeHandle> *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<sp<NativeHandle> *&>, std::tuple<sp<NativeHandle> *> >",
-   "referenced_type" : "type-3257",
-   "self_type" : "type-3257",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1844",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3258", "type-3259" ],
+   "template_args" : [ "type-1845", "type-1846" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPNS_2spINS_12NativeHandleEEEEEENS5_IJS9_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned int &, unsigned int &>, std::tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned int &, unsigned int &>, std::tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-3239",
-   "self_type" : "type-3239",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1824",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3240", "type-3241" ],
+   "template_args" : [ "type-1825", "type-1826" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRjS6_EEENS5_IJjjEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned int &>, std::tuple<unsigned int> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned int &>, std::tuple<unsigned int> >",
-   "referenced_type" : "type-3254",
-   "self_type" : "type-3254",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1840",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3255", "type-3256" ],
+   "template_args" : [ "type-1841", "type-1842" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRjEEENS5_IJjEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long &>, std::tuple<unsigned long> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long &>, std::tuple<unsigned long> >",
-   "referenced_type" : "type-3248",
-   "self_type" : "type-3248",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1834",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3249", "type-3250" ],
+   "template_args" : [ "type-1835", "type-1836" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRmEEENS5_IJmEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long *&>, std::tuple<unsigned long *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long *&>, std::tuple<unsigned long *> >",
-   "referenced_type" : "type-3236",
-   "self_type" : "type-3236",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1820",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3237", "type-3238" ],
+   "template_args" : [ "type-1821", "type-1822" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPmEEENS5_IJS6_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<BufferItem *&, long &, unsigned long &>, std::tuple<BufferItem *, long, unsigned long> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<BufferItem *&, long &, unsigned long &>, std::tuple<BufferItem *, long, unsigned long> >",
-   "referenced_type" : "type-3146",
-   "self_type" : "type-3146",
+   "referenced_type" : "type-1721",
+   "self_type" : "type-1721",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3147", "type-3148" ],
+   "template_args" : [ "type-1722", "type-1723" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRPNS_10BufferItemERlRmEEENS5_IJS7_lmEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<android_dataspace_t &>, std::tuple<android_dataspace_t> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<android_dataspace_t &>, std::tuple<android_dataspace_t> >",
-   "referenced_type" : "type-3191",
-   "self_type" : "type-3191",
+   "referenced_type" : "type-1771",
+   "self_type" : "type-1771",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3192", "type-3193" ],
+   "template_args" : [ "type-1772", "type-1773" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJR19android_dataspace_tEEENS5_IJS6_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<bool &, vector<Segment, allocator<Segment> > *&>, std::tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<bool &, vector<Segment, allocator<Segment> > *&>, std::tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-3206",
-   "self_type" : "type-3206",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1787",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3207", "type-3208" ],
+   "template_args" : [ "type-1788", "type-1789" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRbRPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS9_EEEEEEENS5_IJbSD_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<bool &>, std::tuple<bool> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<bool &>, std::tuple<bool> >",
-   "referenced_type" : "type-3197",
-   "self_type" : "type-3197",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1778",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3198", "type-3199" ],
+   "template_args" : [ "type-1779", "type-1780" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRbEEENS5_IJbEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<const String8 &, String8 *&>, std::tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<const String8 &, String8 *&>, std::tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-3212",
-   "self_type" : "type-3212",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1794",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3213", "type-3214" ],
+   "template_args" : [ "type-1795", "type-1796" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRKNS_7String8ERPS6_EEENS5_IJS8_S9_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<const String8 &>, std::tuple<const String8 &> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<const String8 &>, std::tuple<const String8 &> >",
-   "referenced_type" : "type-3188",
-   "self_type" : "type-3188",
+   "referenced_type" : "type-1768",
+   "self_type" : "type-1768",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3189", "type-3190" ],
+   "template_args" : [ "type-1769", "type-1770" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRKNS_7String8EEEES9_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<const sp<IConsumerListener> &, bool &>, std::tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<const sp<IConsumerListener> &, bool &>, std::tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-3173",
-   "self_type" : "type-3173",
+   "referenced_type" : "type-1751",
+   "self_type" : "type-1751",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3174", "type-3175" ],
+   "template_args" : [ "type-1752", "type-1753" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &, unsigned long &, const sp<Fence> &>, std::tuple<int, unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &, unsigned long &, const sp<Fence> &>, std::tuple<int, unsigned long, const sp<Fence> &> >",
-   "referenced_type" : "type-3164",
-   "self_type" : "type-3164",
+   "referenced_type" : "type-1741",
+   "self_type" : "type-1741",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3165", "type-3166" ],
+   "template_args" : [ "type-1742", "type-1743" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRiRmRKNS_2spINS_5FenceEEEEEENS5_IJimSC_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &>, std::tuple<int> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &>, std::tuple<int> >",
-   "referenced_type" : "type-3155",
-   "self_type" : "type-3155",
+   "referenced_type" : "type-1731",
+   "self_type" : "type-1731",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3156", "type-3157" ],
+   "template_args" : [ "type-1732", "type-1733" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRiEEENS5_IJiEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int *&, const sp<GraphicBuffer> &>, std::tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int *&, const sp<GraphicBuffer> &>, std::tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-3158",
-   "self_type" : "type-3158",
+   "referenced_type" : "type-1735",
+   "self_type" : "type-1735",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3159", "type-3160" ],
+   "template_args" : [ "type-1736", "type-1737" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRPiRKNS_2spINS_13GraphicBufferEEEEEENS5_IJS6_SC_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<sp<NativeHandle> *&>, std::tuple<sp<NativeHandle> *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<sp<NativeHandle> *&>, std::tuple<sp<NativeHandle> *> >",
-   "referenced_type" : "type-3203",
-   "self_type" : "type-3203",
+   "referenced_type" : "type-1784",
+   "self_type" : "type-1784",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3204", "type-3205" ],
+   "template_args" : [ "type-1785", "type-1786" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRPNS_2spINS_12NativeHandleEEEEEENS5_IJS9_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned int &, unsigned int &>, std::tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned int &, unsigned int &>, std::tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-3182",
-   "self_type" : "type-3182",
+   "referenced_type" : "type-1761",
+   "self_type" : "type-1761",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3183", "type-3184" ],
+   "template_args" : [ "type-1762", "type-1763" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRjS6_EEENS5_IJjjEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned int &>, std::tuple<unsigned int> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned int &>, std::tuple<unsigned int> >",
-   "referenced_type" : "type-3200",
-   "self_type" : "type-3200",
+   "referenced_type" : "type-1781",
+   "self_type" : "type-1781",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3201", "type-3202" ],
+   "template_args" : [ "type-1782", "type-1783" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRjEEENS5_IJjEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long &>, std::tuple<unsigned long> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long &>, std::tuple<unsigned long> >",
-   "referenced_type" : "type-3194",
-   "self_type" : "type-3194",
+   "referenced_type" : "type-1774",
+   "self_type" : "type-1774",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3195", "type-3196" ],
+   "template_args" : [ "type-1775", "type-1776" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRmEEENS5_IJmEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long *&>, std::tuple<unsigned long *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long *&>, std::tuple<unsigned long *> >",
-   "referenced_type" : "type-3179",
-   "self_type" : "type-3179",
+   "referenced_type" : "type-1758",
+   "self_type" : "type-1758",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3180", "type-3181" ],
+   "template_args" : [ "type-1759", "type-1760" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm0ENSt3__15tupleIJRPmEEENS5_IJS6_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<BufferItem *&, long &, unsigned long &>, std::tuple<BufferItem *, long, unsigned long> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<BufferItem *&, long &, unsigned long &>, std::tuple<BufferItem *, long, unsigned long> >",
-   "referenced_type" : "type-3149",
-   "self_type" : "type-3149",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1725",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3150", "type-3151" ],
+   "template_args" : [ "type-1726", "type-1727" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm1ENSt3__15tupleIJRPNS_10BufferItemERlRmEEENS5_IJS7_lmEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<bool &, vector<Segment, allocator<Segment> > *&>, std::tuple<bool, vector<Segment, allocator<Segment> > *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<bool &, vector<Segment, allocator<Segment> > *&>, std::tuple<bool, vector<Segment, allocator<Segment> > *> >",
-   "referenced_type" : "type-3209",
-   "self_type" : "type-3209",
+   "referenced_type" : "type-1791",
+   "self_type" : "type-1791",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3210", "type-3211" ],
+   "template_args" : [ "type-1792", "type-1793" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm1ENSt3__15tupleIJRbRPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS9_EEEEEEENS5_IJbSD_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<const String8 &, String8 *&>, std::tuple<const String8 &, String8 *> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<const String8 &, String8 *&>, std::tuple<const String8 &, String8 *> >",
-   "referenced_type" : "type-3215",
-   "self_type" : "type-3215",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1797",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3216", "type-3217" ],
+   "template_args" : [ "type-1798", "type-1799" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm1ENSt3__15tupleIJRKNS_7String8ERPS6_EEENS5_IJS8_S9_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<const sp<IConsumerListener> &, bool &>, std::tuple<const sp<IConsumerListener> &, bool> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<const sp<IConsumerListener> &, bool &>, std::tuple<const sp<IConsumerListener> &, bool> >",
-   "referenced_type" : "type-3176",
-   "self_type" : "type-3176",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1754",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3177", "type-3178" ],
+   "template_args" : [ "type-1755", "type-1756" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm1ENSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int &, unsigned long &, const sp<Fence> &>, std::tuple<int, unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int &, unsigned long &, const sp<Fence> &>, std::tuple<int, unsigned long, const sp<Fence> &> >",
-   "referenced_type" : "type-3167",
-   "self_type" : "type-3167",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1745",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3168", "type-3169" ],
+   "template_args" : [ "type-1746", "type-1747" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm1ENSt3__15tupleIJRiRmRKNS_2spINS_5FenceEEEEEENS5_IJimSC_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int *&, const sp<GraphicBuffer> &>, std::tuple<int *, const sp<GraphicBuffer> &> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int *&, const sp<GraphicBuffer> &>, std::tuple<int *, const sp<GraphicBuffer> &> >",
-   "referenced_type" : "type-3161",
-   "self_type" : "type-3161",
+   "referenced_type" : "type-1738",
+   "self_type" : "type-1738",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3162", "type-3163" ],
+   "template_args" : [ "type-1739", "type-1740" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm1ENSt3__15tupleIJRPiRKNS_2spINS_13GraphicBufferEEEEEENS5_IJS6_SC_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<unsigned int &, unsigned int &>, std::tuple<unsigned int, unsigned int> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<unsigned int &, unsigned int &>, std::tuple<unsigned int, unsigned int> >",
-   "referenced_type" : "type-3185",
-   "self_type" : "type-3185",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1764",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3186", "type-3187" ],
+   "template_args" : [ "type-1765", "type-1766" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm1ENSt3__15tupleIJRjS6_EEENS5_IJjjEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<BufferItem *&, long &, unsigned long &>, std::tuple<BufferItem *, long, unsigned long> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<BufferItem *&, long &, unsigned long &>, std::tuple<BufferItem *, long, unsigned long> >",
-   "referenced_type" : "type-3152",
-   "self_type" : "type-3152",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1728",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3153", "type-3154" ],
+   "template_args" : [ "type-1729", "type-1730" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm2ENSt3__15tupleIJRPNS_10BufferItemERlRmEEENS5_IJS7_lmEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<int &, unsigned long &, const sp<Fence> &>, std::tuple<int, unsigned long, const sp<Fence> &> >",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<int &, unsigned long &, const sp<Fence> &>, std::tuple<int, unsigned long, const sp<Fence> &> >",
-   "referenced_type" : "type-3170",
-   "self_type" : "type-3170",
+   "referenced_type" : "type-1748",
+   "self_type" : "type-1748",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3171", "type-3172" ],
+   "template_args" : [ "type-1749", "type-1750" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILm2ENSt3__15tupleIJRiRmRKNS_2spINS_5FenceEEEEEENS5_IJimSC_EEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::BufferItem *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::BufferItem *&>",
-   "referenced_type" : "type-3266",
-   "self_type" : "type-3266",
+   "referenced_type" : "type-1853",
+   "self_type" : "type-1853",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3267" ],
+   "template_args" : [ "type-1854" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPNS_10BufferItemEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::String8 *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::String8 *&>",
-   "referenced_type" : "type-3289",
-   "self_type" : "type-3289",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1885",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3290" ],
+   "template_args" : [ "type-1886" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPNS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::sp<android::NativeHandle> *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::sp<android::NativeHandle> *&>",
-   "referenced_type" : "type-3284",
-   "self_type" : "type-3284",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1879",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3285" ],
+   "template_args" : [ "type-1880" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPNS_2spINS_12NativeHandleEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android_dataspace_t &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android_dataspace_t &>",
-   "referenced_type" : "type-3283",
-   "self_type" : "type-3283",
+   "referenced_type" : "type-1878",
+   "self_type" : "type-1878",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-768" ],
@@ -56146,8 +56134,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
-   "referenced_type" : "type-3277",
-   "self_type" : "type-3277",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1871",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-767" ],
@@ -56157,41 +56145,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::String8 &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::String8 &>",
-   "referenced_type" : "type-3281",
-   "self_type" : "type-3281",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1875",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1937" ],
+   "template_args" : [ "type-1876" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRKNS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::sp<android::Fence> &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::sp<android::Fence> &>",
-   "referenced_type" : "type-3274",
-   "self_type" : "type-3274",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1862",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1804" ],
+   "template_args" : [ "type-1863" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRKNS_2spINS_5FenceEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::sp<android::GraphicBuffer> &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::sp<android::GraphicBuffer> &>",
-   "referenced_type" : "type-3272",
-   "self_type" : "type-3272",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1860",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-1663" ],
+   "template_args" : [ "type-1861" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRKNS_2spINS_13GraphicBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::sp<android::IConsumerListener> &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::sp<android::IConsumerListener> &>",
-   "referenced_type" : "type-3276",
-   "self_type" : "type-3276",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1869",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-945" ],
@@ -56201,8 +56189,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
-   "referenced_type" : "type-3270",
-   "self_type" : "type-3270",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1858",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-200" ],
@@ -56212,41 +56200,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
-   "referenced_type" : "type-3271",
-   "self_type" : "type-3271",
+   "referenced_type" : "type-1859",
+   "self_type" : "type-1859",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2959" ],
+   "template_args" : [ "type-1509" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<long &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<long &>",
-   "referenced_type" : "type-3268",
-   "self_type" : "type-3268",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1856",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2890" ],
+   "template_args" : [ "type-1430" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<std::vector<android::OccupancyTracker::Segment, std::allocator<android::OccupancyTracker::Segment> > *&>",
-   "referenced_type" : "type-3287",
-   "self_type" : "type-3287",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1883",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3288" ],
+   "template_args" : [ "type-1884" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned int &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned int &>",
-   "referenced_type" : "type-3280",
-   "self_type" : "type-3280",
+   "referenced_type" : "type-1874",
+   "self_type" : "type-1874",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-764" ],
@@ -56256,8 +56244,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long &>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long &>",
-   "referenced_type" : "type-3269",
-   "self_type" : "type-3269",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1857",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-10" ],
@@ -56267,11 +56255,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long *&>",
    "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long *&>",
-   "referenced_type" : "type-3278",
-   "self_type" : "type-3278",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1872",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3279" ],
+   "template_args" : [ "type-1873" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPmEE"
   },
   {
@@ -56279,7 +56267,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2949"
+     "referenced_type" : "type-1495"
     }
    ],
    "fields" :
@@ -56294,11 +56282,11 @@
    "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener>",
    "name" : "android::SafeBpInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-2987",
-   "self_type" : "type-2987",
+   "referenced_type" : "type-1538",
+   "self_type" : "type-1538",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2989" ],
+   "template_args" : [ "type-1539" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -56332,9 +56320,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -56457,7 +56442,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-3061"
+     "referenced_type" : "type-1625"
     }
    ],
    "fields" :
@@ -56472,11 +56457,11 @@
    "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-3143",
-   "self_type" : "type-3143",
+   "referenced_type" : "type-1718",
+   "self_type" : "type-1718",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3144" ],
+   "template_args" : [ "type-1719" ],
    "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -56667,198 +56652,198 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
-   "referenced_type" : "type-3121",
-   "self_type" : "type-3121",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1694",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3122" ],
+   "template_args" : [ "type-1695" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFivEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(BufferItem *, long, unsigned long)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(BufferItem *, long, unsigned long)>",
-   "referenced_type" : "type-3111",
-   "self_type" : "type-3111",
+   "referenced_type" : "type-1683",
+   "self_type" : "type-1683",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3112" ],
+   "template_args" : [ "type-1684" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiPNS_10BufferItemElmEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(android_dataspace_t)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(android_dataspace_t)>",
-   "referenced_type" : "type-3129",
-   "self_type" : "type-3129",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1703",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3130" ],
+   "template_args" : [ "type-1704" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFi19android_dataspace_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(bool)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(bool)>",
-   "referenced_type" : "type-3133",
-   "self_type" : "type-3133",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1707",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3134" ],
+   "template_args" : [ "type-1708" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFibEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(bool, vector<Segment, allocator<Segment> > *)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(bool, vector<Segment, allocator<Segment> > *)>",
-   "referenced_type" : "type-3139",
-   "self_type" : "type-3139",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1714",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3140" ],
+   "template_args" : [ "type-1715" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFibPNSt3__16vectorINS_16OccupancyTracker7SegmentENS3_9allocatorIS6_EEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(const String8 &)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(const String8 &)>",
-   "referenced_type" : "type-3127",
-   "self_type" : "type-3127",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1701",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3128" ],
+   "template_args" : [ "type-1702" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiRKNS_7String8EEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(const String8 &, String8 *) const>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(const String8 &, String8 *) const>",
-   "referenced_type" : "type-3141",
-   "self_type" : "type-3141",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3142" ],
+   "template_args" : [ "type-1717" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEKFiRKNS_7String8EPS3_EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(const sp<IConsumerListener> &, bool)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(const sp<IConsumerListener> &, bool)>",
-   "referenced_type" : "type-3119",
-   "self_type" : "type-3119",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3120" ],
+   "template_args" : [ "type-1693" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiRKNS_2spINS_17IConsumerListenerEEEbEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int *, const sp<GraphicBuffer> &)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int *, const sp<GraphicBuffer> &)>",
-   "referenced_type" : "type-3115",
-   "self_type" : "type-3115",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3116" ],
+   "template_args" : [ "type-1688" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiPiRKNS_2spINS_13GraphicBufferEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int)>",
-   "referenced_type" : "type-3113",
-   "self_type" : "type-3113",
+   "referenced_type" : "type-1685",
+   "self_type" : "type-1685",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3114" ],
+   "template_args" : [ "type-1686" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiiEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int, unsigned long, const sp<Fence> &)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int, unsigned long, const sp<Fence> &)>",
-   "referenced_type" : "type-3117",
-   "self_type" : "type-3117",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1690",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3118" ],
+   "template_args" : [ "type-1691" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiimRKNS_2spINS_5FenceEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(sp<NativeHandle> *) const>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(sp<NativeHandle> *) const>",
-   "referenced_type" : "type-3137",
-   "self_type" : "type-3137",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1712",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3138" ],
+   "template_args" : [ "type-1713" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEKFiPNS_2spINS_12NativeHandleEEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned int)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned int)>",
-   "referenced_type" : "type-3135",
-   "self_type" : "type-3135",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3136" ],
+   "template_args" : [ "type-1710" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFijEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned int, unsigned int)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned int, unsigned int)>",
-   "referenced_type" : "type-3125",
-   "self_type" : "type-3125",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3126" ],
+   "template_args" : [ "type-1699" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFijjEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long *)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long *)>",
-   "referenced_type" : "type-3123",
-   "self_type" : "type-3123",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1696",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3124" ],
+   "template_args" : [ "type-1697" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiPmEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long)>",
    "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long)>",
-   "referenced_type" : "type-3131",
-   "self_type" : "type-3131",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1705",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-3132" ],
+   "template_args" : [ "type-1706" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFimEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)()>",
    "name" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)()>",
-   "referenced_type" : "type-2982",
-   "self_type" : "type-2982",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1534",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2983" ],
+   "template_args" : [ "type-1535" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvvEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)(const BufferItem &)>",
    "name" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)(const BufferItem &)>",
-   "referenced_type" : "type-2985",
-   "self_type" : "type-2985",
+   "referenced_type" : "type-1536",
+   "self_type" : "type-1536",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-2986" ],
+   "template_args" : [ "type-1537" ],
    "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvRKNS_10BufferItemEEEE"
   },
   {
@@ -56884,8 +56869,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
    "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 4, unsigned int>",
-   "referenced_type" : "type-3109",
-   "self_type" : "type-3109",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-2" ],
@@ -56895,8 +56880,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long>",
    "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long>",
-   "referenced_type" : "type-3106",
-   "self_type" : "type-3106",
+   "referenced_type" : "type-1677",
+   "self_type" : "type-1677",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-11" ],
@@ -56906,8 +56891,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<true, 4, int>",
    "name" : "android::SafeInterface::ParcelHandler::HandleInt<true, 4, int>",
-   "referenced_type" : "type-3108",
-   "self_type" : "type-3108",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1680",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-4" ],
@@ -56917,8 +56902,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<true, 8, long>",
    "name" : "android::SafeInterface::ParcelHandler::HandleInt<true, 8, long>",
-   "referenced_type" : "type-3104",
-   "self_type" : "type-3104",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1675",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "template_args" : [ "type-32" ],
@@ -57037,11 +57022,11 @@
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::hardware::IBinder> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-2810",
-   "self_type" : "type-2810",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1355",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-2811" ],
+   "template_args" : [ "type-1356" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -57331,7 +57316,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -57346,8 +57331,8 @@
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1670",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -57555,7 +57540,7 @@
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-1359"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
@@ -57570,18 +57555,18 @@
     {
      "field_name" : "bufferHeader",
      "field_offset" : 192,
-     "referenced_type" : "type-1649"
+     "referenced_type" : "type-2378"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 256,
-     "referenced_type" : "type-1682"
+     "referenced_type" : "type-2410"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-1681",
-   "self_type" : "type-1681",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2409",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -57763,11 +57748,11 @@
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1962",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2679",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-1963" ],
+   "template_args" : [ "type-2680" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -57928,11 +57913,11 @@
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-2816",
-   "self_type" : "type-2816",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1361",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2817" ],
+   "template_args" : [ "type-1362" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -57983,11 +57968,11 @@
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-2812",
-   "self_type" : "type-2812",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1357",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2813" ],
+   "template_args" : [ "type-1358" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -58093,8 +58078,8 @@
    "linker_set_key" : "android::Vector<int>",
    "name" : "android::Vector<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2688",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-4" ],
@@ -58276,13 +58261,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1671"
+     "referenced_type" : "type-2399"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-1673",
-   "self_type" : "type-1673",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2401",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -58303,8 +58288,8 @@
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-1671",
-   "self_type" : "type-1671",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2399",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -58325,8 +58310,8 @@
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1679",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2407",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -58342,7 +58327,7 @@
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-1675"
+     "referenced_type" : "type-2403"
     },
     {
      "field_name" : "nFenceFd",
@@ -58352,8 +58337,8 @@
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-1674",
-   "self_type" : "type-1674",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -58363,14 +58348,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1624"
+     "referenced_type" : "type-2353"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1626",
-   "self_type" : "type-1626",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -58417,30 +58402,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-2608",
+   "self_type" : "type-2608",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-1888" ],
+   "template_args" : [ "type-4", "type-2609" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::aggregate_traits<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-1884",
-   "self_type" : "type-1884",
+   "referenced_type" : "type-2605",
+   "self_type" : "type-2605",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-4", "type-1885" ],
+   "template_args" : [ "type-4", "type-2606" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<unsigned int, unsigned int>",
    "name" : "android::aggregate_traits<unsigned int, unsigned int>",
-   "referenced_type" : "type-1883",
-   "self_type" : "type-1883",
+   "referenced_type" : "type-2604",
+   "self_type" : "type-2604",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2", "type-2" ],
@@ -58642,8 +58627,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1803",
+   "referenced_type" : "type-2525",
+   "self_type" : "type-2525",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -58664,8 +58649,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
    "name" : "android::base::EagerEvaluator<char *, char *>",
-   "referenced_type" : "type-4042",
-   "self_type" : "type-4042",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4702",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-254" ],
@@ -58687,8 +58672,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
    "name" : "android::base::EagerEvaluator<char *, const char *>",
-   "referenced_type" : "type-4038",
-   "self_type" : "type-4038",
+   "referenced_type" : "type-4698",
+   "self_type" : "type-4698",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-254", "type-124" ],
@@ -58710,8 +58695,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
    "name" : "android::base::EagerEvaluator<const char *, char *>",
-   "referenced_type" : "type-4025",
-   "self_type" : "type-4025",
+   "referenced_type" : "type-4685",
+   "self_type" : "type-4685",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-124", "type-254" ],
@@ -58733,8 +58718,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *>",
    "name" : "android::base::EagerEvaluator<const char *, const char *>",
-   "referenced_type" : "type-4009",
-   "self_type" : "type-4009",
+   "referenced_type" : "type-4669",
+   "self_type" : "type-4669",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-124", "type-124" ],
@@ -58756,11 +58741,11 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const signed char *, const signed char *>",
    "name" : "android::base::EagerEvaluator<const signed char *, const signed char *>",
-   "referenced_type" : "type-4066",
-   "self_type" : "type-4066",
+   "referenced_type" : "type-4726",
+   "self_type" : "type-4726",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4067", "type-4067" ],
+   "template_args" : [ "type-4727", "type-4727" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
   },
   {
@@ -58779,11 +58764,11 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *>",
    "name" : "android::base::EagerEvaluator<const signed char *, signed char *>",
-   "referenced_type" : "type-4073",
-   "self_type" : "type-4073",
+   "referenced_type" : "type-4733",
+   "self_type" : "type-4733",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4067", "type-4074" ],
+   "template_args" : [ "type-4727", "type-4734" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
   },
   {
@@ -58802,8 +58787,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *>",
    "name" : "android::base::EagerEvaluator<const unsigned char *, const unsigned char *>",
-   "referenced_type" : "type-4046",
-   "self_type" : "type-4046",
+   "referenced_type" : "type-4706",
+   "self_type" : "type-4706",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-99", "type-99" ],
@@ -58825,8 +58810,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
    "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
-   "referenced_type" : "type-4050",
-   "self_type" : "type-4050",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4710",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-99", "type-91" ],
@@ -58848,11 +58833,11 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *>",
    "name" : "android::base::EagerEvaluator<signed char *, const signed char *>",
-   "referenced_type" : "type-4077",
-   "self_type" : "type-4077",
+   "referenced_type" : "type-4737",
+   "self_type" : "type-4737",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4074", "type-4067" ],
+   "template_args" : [ "type-4734", "type-4727" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
   },
   {
@@ -58871,11 +58856,11 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *>",
    "name" : "android::base::EagerEvaluator<signed char *, signed char *>",
-   "referenced_type" : "type-4084",
-   "self_type" : "type-4084",
+   "referenced_type" : "type-4744",
+   "self_type" : "type-4744",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
-   "template_args" : [ "type-4074", "type-4074" ],
+   "template_args" : [ "type-4734", "type-4734" ],
    "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
   },
   {
@@ -58894,8 +58879,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
    "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
-   "referenced_type" : "type-4053",
-   "self_type" : "type-4053",
+   "referenced_type" : "type-4713",
+   "self_type" : "type-4713",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-91", "type-99" ],
@@ -58917,8 +58902,8 @@
    ],
    "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
    "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
-   "referenced_type" : "type-4059",
-   "self_type" : "type-4059",
+   "referenced_type" : "type-4719",
+   "self_type" : "type-4719",
    "size" : 16,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "template_args" : [ "type-91", "type-91" ],
@@ -58937,8 +58922,8 @@
    "linker_set_key" : "android::base::ErrnoRestorer",
    "name" : "android::base::ErrnoRestorer",
    "record_kind" : "class",
-   "referenced_type" : "type-4000",
-   "self_type" : "type-4000",
+   "referenced_type" : "type-4660",
+   "self_type" : "type-4660",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
@@ -58950,14 +58935,14 @@
     {
      "access" : "private",
      "field_name" : "data_",
-     "referenced_type" : "type-4095"
+     "referenced_type" : "type-4755"
     }
    ],
    "linker_set_key" : "android::base::LogMessage",
    "name" : "android::base::LogMessage",
    "record_kind" : "class",
-   "referenced_type" : "type-4094",
-   "self_type" : "type-4094",
+   "referenced_type" : "type-4754",
+   "self_type" : "type-4754",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogMessageE"
@@ -58969,14 +58954,14 @@
     {
      "access" : "private",
      "field_name" : "default_log_id_",
-     "referenced_type" : "type-4047"
+     "referenced_type" : "type-4707"
     }
    ],
    "linker_set_key" : "android::base::LogdLogger",
    "name" : "android::base::LogdLogger",
    "record_kind" : "class",
-   "referenced_type" : "type-4065",
-   "self_type" : "type-4065",
+   "referenced_type" : "type-4725",
+   "self_type" : "type-4725",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base10LogdLoggerE"
@@ -58988,14 +58973,14 @@
     {
      "access" : "private",
      "field_name" : "old_",
-     "referenced_type" : "type-3997"
+     "referenced_type" : "type-4657"
     }
    ],
    "linker_set_key" : "android::base::ScopedLogSeverity",
    "name" : "android::base::ScopedLogSeverity",
    "record_kind" : "class",
-   "referenced_type" : "type-4099",
-   "self_type" : "type-4099",
+   "referenced_type" : "type-4759",
+   "self_type" : "type-4759",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/logging.h",
    "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
@@ -59013,11 +58998,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-1834",
-   "self_type" : "type-1834",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2555",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-1803" ],
+   "template_args" : [ "type-2525" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -59056,7 +59041,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2815"
+     "referenced_type" : "type-1360"
     }
    ],
    "fields" :
@@ -59077,7 +59062,7 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 128,
-     "referenced_type" : "type-2819"
+     "referenced_type" : "type-1364"
     },
     {
      "access" : "private",
@@ -59089,8 +59074,8 @@
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-2818",
-   "self_type" : "type-2818",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -59206,7 +59191,7 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 64,
-     "referenced_type" : "type-2829"
+     "referenced_type" : "type-1373"
     },
     {
      "access" : "private",
@@ -59218,14 +59203,14 @@
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 192,
-     "referenced_type" : "type-2830"
+     "referenced_type" : "type-1374"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-2828",
-   "self_type" : "type-2828",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1372",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -59444,8 +59429,8 @@
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-2815",
-   "self_type" : "type-2815",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1360",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -59561,8 +59546,8 @@
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-2827",
-   "self_type" : "type-2827",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1371",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -59649,8 +59634,8 @@
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-2833",
-   "self_type" : "type-2833",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1377",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -59732,13 +59717,13 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-2852"
+     "referenced_type" : "type-1394"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 64,
-     "referenced_type" : "type-2816"
+     "referenced_type" : "type-1361"
     },
     {
      "access" : "private",
@@ -59762,13 +59747,13 @@
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 1344,
-     "referenced_type" : "type-2834"
+     "referenced_type" : "type-1378"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 2432,
-     "referenced_type" : "type-2834"
+     "referenced_type" : "type-1378"
     },
     {
      "access" : "private",
@@ -59810,7 +59795,7 @@
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 3776,
-     "referenced_type" : "type-2859"
+     "referenced_type" : "type-1400"
     },
     {
      "access" : "private",
@@ -59828,26 +59813,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 3904,
-     "referenced_type" : "type-2860"
+     "referenced_type" : "type-1401"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 4096,
-     "referenced_type" : "type-2825"
+     "referenced_type" : "type-1369"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 4160,
-     "referenced_type" : "type-2850"
+     "referenced_type" : "type-1392"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-2851",
-   "self_type" : "type-2851",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1393",
    "size" : 528,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -59865,7 +59850,7 @@
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 64,
-     "referenced_type" : "type-2835"
+     "referenced_type" : "type-1379"
     },
     {
      "access" : "private",
@@ -59949,7 +59934,7 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 960,
-     "referenced_type" : "type-2837"
+     "referenced_type" : "type-1380"
     },
     {
      "access" : "private",
@@ -59961,8 +59946,8 @@
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-2834",
-   "self_type" : "type-2834",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -59989,8 +59974,8 @@
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-2840",
-   "self_type" : "type-2840",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -60022,13 +60007,13 @@
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 192,
-     "referenced_type" : "type-2856"
+     "referenced_type" : "type-1398"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 512,
-     "referenced_type" : "type-2857"
+     "referenced_type" : "type-1399"
     },
     {
      "access" : "private",
@@ -60058,7 +60043,7 @@
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 1408,
-     "referenced_type" : "type-2812"
+     "referenced_type" : "type-1357"
     },
     {
      "access" : "private",
@@ -60070,7 +60055,7 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 1792,
-     "referenced_type" : "type-2849"
+     "referenced_type" : "type-1391"
     },
     {
      "access" : "private",
@@ -60082,7 +60067,7 @@
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 1920,
-     "referenced_type" : "type-2822"
+     "referenced_type" : "type-1367"
     },
     {
      "access" : "private",
@@ -60118,14 +60103,14 @@
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2432,
-     "referenced_type" : "type-2850"
+     "referenced_type" : "type-1392"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-2855",
-   "self_type" : "type-2855",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1397",
    "size" : 328,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -60203,7 +60188,7 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-2814"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "refs",
@@ -60213,8 +60198,8 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-2813",
-   "self_type" : "type-2813",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1358",
    "size" : 16,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -60239,8 +60224,8 @@
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status>",
    "record_kind" : "class",
-   "referenced_type" : "type-4809",
-   "self_type" : "type-4809",
+   "referenced_type" : "type-7522",
+   "self_type" : "type-7522",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-607" ],
@@ -60260,17 +60245,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-1738"
+     "referenced_type" : "type-2465"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3704",
-   "self_type" : "type-3704",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4362",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1738" ],
+   "template_args" : [ "type-2465" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -60287,17 +60272,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-1729"
+     "referenced_type" : "type-2456"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3831",
-   "self_type" : "type-3831",
+   "referenced_type" : "type-4491",
+   "self_type" : "type-4491",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1729" ],
+   "template_args" : [ "type-2456" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_017IProducerListenerEEEEE"
   },
   {
@@ -60314,17 +60299,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-1751"
+     "referenced_type" : "type-2478"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3710",
-   "self_type" : "type-3710",
+   "referenced_type" : "type-4368",
+   "self_type" : "type-4368",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1751" ],
+   "template_args" : [ "type-2478" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_022IGraphicBufferProducerEEEEE"
   },
   {
@@ -60341,17 +60326,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-1745"
+     "referenced_type" : "type-2472"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> >",
    "record_kind" : "class",
-   "referenced_type" : "type-3837",
-   "self_type" : "type-3837",
+   "referenced_type" : "type-4497",
+   "self_type" : "type-4497",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-1745" ],
+   "template_args" : [ "type-2472" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_017IProducerListenerEEEEE"
   },
   {
@@ -60374,8 +60359,8 @@
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3698",
+   "referenced_type" : "type-4356",
+   "self_type" : "type-4356",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-95" ],
@@ -60428,8 +60413,8 @@
    "linker_set_key" : "android::hardware::Return<unsigned long>",
    "name" : "android::hardware::Return<unsigned long>",
    "record_kind" : "class",
-   "referenced_type" : "type-4813",
-   "self_type" : "type-4813",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7526",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "template_args" : [ "type-11" ],
@@ -60622,8 +60607,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(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<FrameEventsDelta>::(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<FrameEventsDelta>::(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-358",
    "self_type" : "type-358",
@@ -60646,8 +60631,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-351",
    "self_type" : "type-351",
@@ -60670,8 +60655,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(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<Rect>::(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<Rect>::(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-374",
    "self_type" : "type-374",
@@ -60784,8 +60769,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-349",
    "self_type" : "type-349",
@@ -60826,8 +60811,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-341",
    "self_type" : "type-341",
@@ -60850,8 +60835,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(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-383",
    "self_type" : "type-383",
@@ -60892,8 +60877,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-355",
    "self_type" : "type-355",
@@ -60934,8 +60919,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-392",
    "self_type" : "type-392",
@@ -61500,8 +61485,8 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
-   "referenced_type" : "type-1731",
-   "self_type" : "type-1731",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2458",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/bufferqueue/1.0/android.hardware.graphics.bufferqueue@1.0_genc++_headers/gen/android/hardware/graphics/bufferqueue/1.0/IProducerListener.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_017IProducerListenerE",
@@ -64172,17 +64157,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3574"
+     "referenced_type" : "type-4232"
     }
    ],
    "linker_set_key" : "android::sp<android::BpGraphicBufferProducer>",
    "name" : "android::sp<android::BpGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-3573",
-   "self_type" : "type-3573",
+   "referenced_type" : "type-4231",
+   "self_type" : "type-4231",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3576" ],
+   "template_args" : [ "type-4234" ],
    "unique_id" : "_ZTSN7android2spINS_23BpGraphicBufferProducerEEE"
   },
   {
@@ -64192,17 +64177,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3795"
+     "referenced_type" : "type-4454"
     }
    ],
    "linker_set_key" : "android::sp<android::BpProducerListener>",
    "name" : "android::sp<android::BpProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-3798",
-   "self_type" : "type-3798",
+   "referenced_type" : "type-4457",
+   "self_type" : "type-4457",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3799" ],
+   "template_args" : [ "type-4458" ],
    "unique_id" : "_ZTSN7android2spINS_18BpProducerListenerEEE"
   },
   {
@@ -64272,17 +64257,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1798"
+     "referenced_type" : "type-1866"
     }
    ],
    "linker_set_key" : "android::sp<android::Fence>",
    "name" : "android::sp<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1797",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1865",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1800" ],
+   "template_args" : [ "type-1868" ],
    "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
   },
   {
@@ -64378,8 +64363,8 @@
    "linker_set_key" : "android::sp<android::GraphicBufferSource>",
    "name" : "android::sp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1823",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2544",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-566" ],
@@ -64392,17 +64377,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3601"
+     "referenced_type" : "type-4259"
     }
    ],
    "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
    "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
    "record_kind" : "class",
-   "referenced_type" : "type-3604",
-   "self_type" : "type-3604",
+   "referenced_type" : "type-4262",
+   "self_type" : "type-4262",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3605" ],
+   "template_args" : [ "type-4263" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -64412,17 +64397,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3610"
+     "referenced_type" : "type-4268"
     }
    ],
    "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
    "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
    "record_kind" : "class",
-   "referenced_type" : "type-3613",
-   "self_type" : "type-3613",
+   "referenced_type" : "type-4271",
+   "self_type" : "type-4271",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3614" ],
+   "template_args" : [ "type-4272" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
   },
   {
@@ -64432,17 +64417,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-4169"
+     "referenced_type" : "type-4831"
     }
    ],
    "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
    "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
    "record_kind" : "class",
-   "referenced_type" : "type-4168",
-   "self_type" : "type-4168",
+   "referenced_type" : "type-4830",
+   "self_type" : "type-4830",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-4171" ],
+   "template_args" : [ "type-4833" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -64452,17 +64437,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-5057"
+     "referenced_type" : "type-5112"
     }
    ],
    "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
    "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
    "record_kind" : "class",
-   "referenced_type" : "type-5056",
-   "self_type" : "type-5056",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5111",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-5059" ],
+   "template_args" : [ "type-5114" ],
    "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
   },
   {
@@ -64712,17 +64697,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2817"
+     "referenced_type" : "type-1362"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-2859",
-   "self_type" : "type-2859",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1400",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2818" ],
+   "template_args" : [ "type-1363" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -64732,17 +64717,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2814"
+     "referenced_type" : "type-1359"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-2823",
-   "self_type" : "type-2823",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1368",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2815" ],
+   "template_args" : [ "type-1360" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -64752,17 +64737,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-2854"
+     "referenced_type" : "type-1396"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-2853",
-   "self_type" : "type-2853",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1395",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-2855" ],
+   "template_args" : [ "type-1397" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -64772,14 +64757,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1739"
+     "referenced_type" : "type-2466"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer>",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1738",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2465",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-595" ],
@@ -64792,17 +64777,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1730"
+     "referenced_type" : "type-2457"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1729",
-   "self_type" : "type-1729",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2456",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1731" ],
+   "template_args" : [ "type-2458" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -64812,17 +64797,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3586"
+     "referenced_type" : "type-4244"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer>",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-3585",
-   "self_type" : "type-3585",
+   "referenced_type" : "type-4243",
+   "self_type" : "type-4243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3588" ],
+   "template_args" : [ "type-4246" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -64832,17 +64817,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3807"
+     "referenced_type" : "type-4467"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener>",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-3810",
-   "self_type" : "type-3810",
+   "referenced_type" : "type-4470",
+   "self_type" : "type-4470",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3811" ],
+   "template_args" : [ "type-4471" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEEE"
   },
   {
@@ -64852,14 +64837,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1752"
+     "referenced_type" : "type-2479"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer>",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1751",
-   "self_type" : "type-1751",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2478",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-677" ],
@@ -64872,14 +64857,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1746"
+     "referenced_type" : "type-2473"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1745",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-604" ],
@@ -64892,17 +64877,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3580"
+     "referenced_type" : "type-4238"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer>",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-3579",
-   "self_type" : "type-3579",
+   "referenced_type" : "type-4237",
+   "self_type" : "type-4237",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3582" ],
+   "template_args" : [ "type-4240" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerEEE"
   },
   {
@@ -64912,17 +64897,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-3800"
+     "referenced_type" : "type-4459"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener>",
    "name" : "android::sp<android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-3803",
-   "self_type" : "type-3803",
+   "referenced_type" : "type-4463",
+   "self_type" : "type-4463",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-3804" ],
+   "template_args" : [ "type-4464" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerEEE"
   },
   {
@@ -64952,14 +64937,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1720"
+     "referenced_type" : "type-2447"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase>",
    "name" : "android::sp<android::hidl::base::V1_0::IBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2446",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-531" ],
@@ -64972,14 +64957,14 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1724"
+     "referenced_type" : "type-2451"
     }
    ],
    "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification>",
    "record_kind" : "class",
-   "referenced_type" : "type-1723",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2450",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
    "template_args" : [ "type-534" ],
@@ -64992,17 +64977,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1792"
+     "referenced_type" : "type-2519"
     }
    ],
    "linker_set_key" : "android::sp<const android::AHandler>",
    "name" : "android::sp<const android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2518",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1793" ],
+   "template_args" : [ "type-2520" ],
    "unique_id" : "_ZTSN7android2spIKNS_8AHandlerEEE"
   },
   {
@@ -65020,8 +65005,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-2590",
+   "self_type" : "type-2590",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65031,8 +65016,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_pointer<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-2587",
+   "self_type" : "type-2587",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65042,8 +65027,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-1862",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2583",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65064,8 +65049,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<int>",
    "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-1865",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2586",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65086,30 +65071,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1870",
+   "referenced_type" : "type-2591",
+   "self_type" : "type-2591",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1871" ],
+   "template_args" : [ "type-2592" ],
    "unique_id" : "_ZTSN7android13trait_pointerINSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::trait_pointer<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1867",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2588",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1868" ],
+   "template_args" : [ "type-2589" ],
    "unique_id" : "_ZTSN7android13trait_pointerINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<unsigned int>",
    "name" : "android::trait_pointer<unsigned int>",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1864",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65130,8 +65115,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-1853",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-2574",
+   "self_type" : "type-2574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65141,8 +65126,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-2571",
+   "self_type" : "type-2571",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65152,8 +65137,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2568",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65174,8 +65159,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-1736",
-   "self_type" : "type-1736",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2463",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-95" ],
@@ -65185,8 +65170,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1774",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2501",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-126" ],
@@ -65218,8 +65203,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-1939",
-   "self_type" : "type-1939",
+   "referenced_type" : "type-2657",
+   "self_type" : "type-2657",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65251,8 +65236,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-2595",
+   "self_type" : "type-2595",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-498" ],
@@ -65262,30 +65247,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2572",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1852" ],
+   "template_args" : [ "type-2573" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::trait_trivial_copy<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1848",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1849" ],
+   "template_args" : [ "type-2570" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1821",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2542",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -65328,8 +65313,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1916",
+   "referenced_type" : "type-2636",
+   "self_type" : "type-2636",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-500" ],
@@ -65339,8 +65324,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-1707",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65361,8 +65346,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1835",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2556",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65372,8 +65357,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1830",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2551",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65383,8 +65368,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_ctor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2550",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65405,8 +65390,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-1717",
-   "self_type" : "type-1717",
+   "referenced_type" : "type-2445",
+   "self_type" : "type-2445",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-95" ],
@@ -65416,8 +65401,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1754",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2481",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-126" ],
@@ -65449,8 +65434,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-1929",
-   "self_type" : "type-1929",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2649",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65482,8 +65467,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-1842",
-   "self_type" : "type-1842",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2563",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-498" ],
@@ -65493,30 +65478,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-1836",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-2557",
+   "self_type" : "type-2557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1837" ],
+   "template_args" : [ "type-2558" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::trait_trivial_ctor<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-1832",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1833" ],
+   "template_args" : [ "type-2554" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-1806",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-2527",
+   "self_type" : "type-2527",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -65526,8 +65511,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-1955",
-   "self_type" : "type-1955",
+   "referenced_type" : "type-2672",
+   "self_type" : "type-2672",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65559,8 +65544,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-1897",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-2618",
+   "self_type" : "type-2618",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-500" ],
@@ -65570,8 +65555,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1672",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65592,8 +65577,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1845",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65603,8 +65588,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-1841",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2562",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65614,8 +65599,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_dtor<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-1838",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-2559",
+   "self_type" : "type-2559",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65636,8 +65621,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-1726",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-2453",
+   "self_type" : "type-2453",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-95" ],
@@ -65647,8 +65632,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-1764",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2491",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-126" ],
@@ -65680,8 +65665,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-1932",
-   "self_type" : "type-1932",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2652",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65713,8 +65698,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2584",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-498" ],
@@ -65724,30 +65709,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-1843",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2564",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1844" ],
+   "template_args" : [ "type-2565" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::trait_trivial_dtor<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2560",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1840" ],
+   "template_args" : [ "type-2561" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-2535",
+   "self_type" : "type-2535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -65757,8 +65742,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-1966",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2683",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -65790,8 +65775,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-1905",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2625",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-500" ],
@@ -65801,8 +65786,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1693",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -65823,8 +65808,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-1947",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "template_args" : [ "type-1240" ],
@@ -65834,8 +65819,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String8>",
    "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-1941",
-   "self_type" : "type-1941",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2658",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "template_args" : [ "type-123" ],
@@ -65845,8 +65830,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2581",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -65856,8 +65841,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1857",
+   "referenced_type" : "type-2578",
+   "self_type" : "type-2578",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -65867,8 +65852,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1854",
+   "referenced_type" : "type-2575",
+   "self_type" : "type-2575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -65889,8 +65874,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-1747",
-   "self_type" : "type-1747",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2474",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-95" ],
@@ -65900,8 +65885,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1795",
+   "referenced_type" : "type-2522",
+   "self_type" : "type-2522",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-126" ],
@@ -65933,8 +65918,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-1944",
-   "self_type" : "type-1944",
+   "referenced_type" : "type-2661",
+   "self_type" : "type-2661",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -65966,8 +65951,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1886",
+   "referenced_type" : "type-2607",
+   "self_type" : "type-2607",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-498" ],
@@ -65977,30 +65962,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-1858",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1859" ],
+   "template_args" : [ "type-2580" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::trait_trivial_move<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-1855",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1856" ],
+   "template_args" : [ "type-2577" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2552",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-92" ],
@@ -66043,8 +66028,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-1927",
-   "self_type" : "type-1927",
+   "referenced_type" : "type-2647",
+   "self_type" : "type-2647",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-500" ],
@@ -66054,8 +66039,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-1715",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-9" ],
@@ -66076,8 +66061,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1880",
+   "referenced_type" : "type-2601",
+   "self_type" : "type-2601",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -66087,8 +66072,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::traits<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-1877",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-2598",
+   "self_type" : "type-2598",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -66098,8 +66083,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::traits<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1872",
+   "referenced_type" : "type-2593",
+   "self_type" : "type-2593",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -66120,8 +66105,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<int>",
    "name" : "android::traits<int>",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2596",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -66142,30 +66127,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::traits<std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-1881",
-   "self_type" : "type-1881",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1882" ],
+   "template_args" : [ "type-2603" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::traits<std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1878",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-1879" ],
+   "template_args" : [ "type-2600" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-1873",
-   "self_type" : "type-1873",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2594",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-2" ],
@@ -66193,13 +66178,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1918"
+     "referenced_type" : "type-2638"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > >",
-   "referenced_type" : "type-1917",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-164" ],
@@ -66210,13 +66195,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1915"
+     "referenced_type" : "type-2635"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-2634",
+   "self_type" : "type-2634",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-150" ],
@@ -66227,13 +66212,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1911"
+     "referenced_type" : "type-2631"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<unsigned int, unsigned int> >",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1910",
+   "referenced_type" : "type-2630",
+   "self_type" : "type-2630",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-146" ],
@@ -66261,13 +66246,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1913"
+     "referenced_type" : "type-2633"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<int>",
    "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-2632",
+   "self_type" : "type-2632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-4" ],
@@ -66716,13 +66701,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-2179"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2178",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -66733,15 +66718,15 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-2180"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1350"
+     "referenced_type" : "type-1409"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1350"
+     "referenced_type" : "type-1409"
     },
     {
      "field_name" : "entry_v3",
@@ -66753,15 +66738,15 @@
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-2181"
     }
    ],
    "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-1450",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-2179",
+   "self_type" : "type-2179",
    "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)"
@@ -66782,8 +66767,8 @@
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1783",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-2510",
+   "self_type" : "type-2510",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -66829,8 +66814,8 @@
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -66990,8 +66975,8 @@
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1350",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1409",
+   "self_type" : "type-1409",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -67035,8 +67020,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2612",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -67053,8 +67038,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::bufferqueue::V2_0::Status> &&",
-   "referenced_type" : "type-4809",
-   "self_type" : "type-4811",
+   "referenced_type" : "type-7522",
+   "self_type" : "type-7524",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67062,8 +67047,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer> > &&",
-   "referenced_type" : "type-3704",
-   "self_type" : "type-3706",
+   "referenced_type" : "type-4362",
+   "self_type" : "type-4364",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67071,8 +67056,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V1_0::IProducerListener> > &&",
-   "referenced_type" : "type-3831",
-   "self_type" : "type-3833",
+   "referenced_type" : "type-4491",
+   "self_type" : "type-4493",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67080,8 +67065,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer> > &&",
-   "referenced_type" : "type-3710",
-   "self_type" : "type-3712",
+   "referenced_type" : "type-4368",
+   "self_type" : "type-4370",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67089,8 +67074,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::bufferqueue::V2_0::IProducerListener> > &&",
-   "referenced_type" : "type-3837",
-   "self_type" : "type-3839",
+   "referenced_type" : "type-4497",
+   "self_type" : "type-4499",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67098,8 +67083,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-3698",
-   "self_type" : "type-3700",
+   "referenced_type" : "type-4356",
+   "self_type" : "type-4358",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67116,8 +67101,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<unsigned long> &&",
    "name" : "android::hardware::Return<unsigned long> &&",
-   "referenced_type" : "type-4813",
-   "self_type" : "type-4815",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7530",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -67171,7 +67156,7 @@
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &&",
    "name" : "android::hardware::hidl_vec<unsigned char> &&",
    "referenced_type" : "type-453",
-   "self_type" : "type-3909",
+   "self_type" : "type-4569",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -67180,7 +67165,7 @@
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
    "referenced_type" : "type-322",
-   "self_type" : "type-1529",
+   "self_type" : "type-2258",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67197,8 +67182,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1805",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-2526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67206,8 +67191,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> &&",
    "name" : "android::sp<android::GraphicBufferSource> &&",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2545",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67215,8 +67200,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
    "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
-   "referenced_type" : "type-3604",
-   "self_type" : "type-3606",
+   "referenced_type" : "type-4262",
+   "self_type" : "type-4264",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67224,8 +67209,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
    "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
-   "referenced_type" : "type-3613",
-   "self_type" : "type-3615",
+   "referenced_type" : "type-4271",
+   "self_type" : "type-4273",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67233,8 +67218,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
    "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
-   "referenced_type" : "type-4168",
-   "self_type" : "type-4178",
+   "referenced_type" : "type-4830",
+   "self_type" : "type-4840",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67242,8 +67227,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
    "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
-   "referenced_type" : "type-5056",
-   "self_type" : "type-5065",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5117",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67252,7 +67237,7 @@
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> &&",
    "name" : "android::sp<android::IBinder::DeathRecipient> &&",
    "referenced_type" : "type-844",
-   "self_type" : "type-3727",
+   "self_type" : "type-4386",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67261,7 +67246,7 @@
    "linker_set_key" : "android::sp<android::IConsumerListener> &&",
    "name" : "android::sp<android::IConsumerListener> &&",
    "referenced_type" : "type-940",
-   "self_type" : "type-3024",
+   "self_type" : "type-1578",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67270,7 +67255,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &&",
    "name" : "android::sp<android::IGraphicBufferConsumer> &&",
    "referenced_type" : "type-574",
-   "self_type" : "type-3042",
+   "self_type" : "type-1601",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67279,7 +67264,7 @@
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
    "name" : "android::sp<android::IGraphicBufferProducer> &&",
    "referenced_type" : "type-570",
-   "self_type" : "type-3571",
+   "self_type" : "type-4229",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67288,7 +67273,7 @@
    "linker_set_key" : "android::sp<android::IProducerListener> &&",
    "name" : "android::sp<android::IProducerListener> &&",
    "referenced_type" : "type-958",
-   "self_type" : "type-3597",
+   "self_type" : "type-4255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -67297,7 +67282,7 @@
    "linker_set_key" : "android::sp<android::NativeHandle> &&",
    "name" : "android::sp<android::NativeHandle> &&",
    "referenced_type" : "type-933",
-   "self_type" : "type-3037",
+   "self_type" : "type-1597",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
diff --git a/Q/64/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump b/Q/64/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 2473668..f78a8c9 100644
--- a/Q/64/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/Q/64/arm_armv7-a-neon/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -524,9 +524,6 @@
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
   },
   {
-   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-  },
-  {
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
   },
   {
@@ -54463,9 +54460,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -55861,9 +55855,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -62026,9 +62017,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -63318,9 +63306,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -67608,8 +67593,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(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<FrameEventsDelta>::(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<FrameEventsDelta>::(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-357",
    "self_type" : "type-357",
@@ -67632,8 +67617,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-350",
    "self_type" : "type-350",
@@ -67656,8 +67641,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(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<Rect>::(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<Rect>::(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-373",
    "self_type" : "type-373",
@@ -67770,8 +67755,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-346",
    "self_type" : "type-346",
@@ -67812,8 +67797,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-340",
    "self_type" : "type-340",
@@ -67836,8 +67821,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(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-382",
    "self_type" : "type-382",
@@ -67878,8 +67863,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-354",
    "self_type" : "type-354",
@@ -67920,8 +67905,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-391",
    "self_type" : "type-391",
diff --git a/Q/64/arm_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump b/Q/64/arm_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 2473668..f78a8c9 100644
--- a/Q/64/arm_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/Q/64/arm_armv8-a/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -524,9 +524,6 @@
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
   },
   {
-   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-  },
-  {
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
   },
   {
@@ -54463,9 +54460,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -55861,9 +55855,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -62026,9 +62017,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -63318,9 +63306,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -67608,8 +67593,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(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<FrameEventsDelta>::(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<FrameEventsDelta>::(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-357",
    "self_type" : "type-357",
@@ -67632,8 +67617,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-350",
    "self_type" : "type-350",
@@ -67656,8 +67641,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(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<Rect>::(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<Rect>::(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-373",
    "self_type" : "type-373",
@@ -67770,8 +67755,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-346",
    "self_type" : "type-346",
@@ -67812,8 +67797,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-340",
    "self_type" : "type-340",
@@ -67836,8 +67821,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(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-382",
    "self_type" : "type-382",
@@ -67878,8 +67863,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-354",
    "self_type" : "type-354",
@@ -67920,8 +67905,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-391",
    "self_type" : "type-391",
diff --git a/Q/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump b/Q/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
index cd5fb32..01acb53 100644
--- a/Q/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/Q/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -523,9 +523,6 @@
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
   },
   {
-   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-  },
-  {
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
   },
   {
@@ -47431,9 +47428,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -48829,9 +48823,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -54994,9 +54985,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -56286,9 +56274,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -60576,8 +60561,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(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<FrameEventsDelta>::(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<FrameEventsDelta>::(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-357",
    "self_type" : "type-357",
@@ -60600,8 +60585,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-350",
    "self_type" : "type-350",
@@ -60624,8 +60609,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(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<Rect>::(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<Rect>::(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-373",
    "self_type" : "type-373",
@@ -60738,8 +60723,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-346",
    "self_type" : "type-346",
@@ -60780,8 +60765,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-340",
    "self_type" : "type-340",
@@ -60804,8 +60789,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(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-382",
    "self_type" : "type-382",
@@ -60846,8 +60831,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-354",
    "self_type" : "type-354",
@@ -60888,8 +60873,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-391",
    "self_type" : "type-391",
diff --git a/Q/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump b/Q/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
index 1d12420..a698be2 100644
--- a/Q/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/Q/64/x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -523,9 +523,6 @@
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
   },
   {
-   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-  },
-  {
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
   },
   {
@@ -47476,9 +47473,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -48874,9 +48868,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -55039,9 +55030,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -56331,9 +56319,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -60621,8 +60606,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(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<FrameEventsDelta>::(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<FrameEventsDelta>::(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-358",
    "self_type" : "type-358",
@@ -60645,8 +60630,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-351",
    "self_type" : "type-351",
@@ -60669,8 +60654,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(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<Rect>::(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<Rect>::(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-374",
    "self_type" : "type-374",
@@ -60783,8 +60768,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-349",
    "self_type" : "type-349",
@@ -60825,8 +60810,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-341",
    "self_type" : "type-341",
@@ -60849,8 +60834,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(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-383",
    "self_type" : "type-383",
@@ -60891,8 +60876,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-355",
    "self_type" : "type-355",
@@ -60933,8 +60918,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-392",
    "self_type" : "type-392",
diff --git a/Q/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump b/Q/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
index cd5fb32..01acb53 100644
--- a/Q/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/Q/64/x86_x86_64/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -523,9 +523,6 @@
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
   },
   {
-   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-  },
-  {
    "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
   },
   {
@@ -47431,9 +47428,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -48829,9 +48823,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -54994,9 +54985,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -56286,9 +56274,6 @@
      "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
     },
     {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
      "is_pure" : true,
      "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
     },
@@ -60576,8 +60561,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<FrameEventsDelta>::(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<FrameEventsDelta>::(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<FrameEventsDelta>::(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-357",
    "self_type" : "type-357",
@@ -60600,8 +60585,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-350",
    "self_type" : "type-350",
@@ -60624,8 +60609,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<Rect>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<Rect>::(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<Rect>::(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<Rect>::(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-373",
    "self_type" : "type-373",
@@ -60738,8 +60723,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-346",
    "self_type" : "type-346",
@@ -60780,8 +60765,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-340",
    "self_type" : "type-340",
@@ -60804,8 +60789,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<hidl_array<int, 4> >::(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-382",
    "self_type" : "type-382",
@@ -60846,8 +60831,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-354",
    "self_type" : "type-354",
@@ -60888,8 +60873,8 @@
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:111:5) at system/libhidl/base/include/hidl/HidlInternal.h:111:5",
    "record_kind" : "union",
    "referenced_type" : "type-391",
    "self_type" : "type-391",